Fixed failures encountered when syncing up with recent file-encryptor changes