FIPS 186-2 fixes