Vault fixes