Fix Vault support
Fix Vault support

Former-commit-id: bfc0c8ab1bad2c623d746d2dfad89a56590062ab [formerly 3703aaa53f5b7fc9bc5c5d3bb3355db6c58a9b80]
Former-commit-id: dba438ae57a42192a899f8225310fd92ccc689ef
games647/ScoreboardStats,PiLogic/ScoreboardStats