Patch several of the CP1 CVT.x.y functions.