Further bug fixes to VaultManager.