Fix Vault support