Edits to rebuild_vault and makefile scripts