Fixed misc issues with vault.