VC0706 fixes