Cipher fixes.