Minor changes in Encrypt()