A couple of API tweaks to support Vault.