Fixed: Vault

Also, probably broke things without Vault. I'll fix later.