IPasswordEncryptor and fixes