BoS fix and nerf GCV vault