Final FIPS changes and some build fixes.