Vault Fixes