Fixed warnings/errors with Vault Integration.