- Lots of fixes over automatic Encryption/decryption detection