Fix Klobys and restore VGP