Fixed Vault build errors