More updates to ConvertFrom-EncryptedFile / ConvertTo-EncryptedFile