Further work on Vault debugging