Merge "Misc fixes to CryptKeeper"