Enryption Fixes