The Vaults: Preparation for Exemplar Update - Fixes due to breaking updates

More to come