Minimal changes for FIPS mode