Encrypted save fixes