Rough fixes for the encryption validation