fips corrections
Merge pull request #1500 from ml054/fips

fips corrections