Porting over my attr_encryptor fixes