Further work on vault debugging