Patches to building VPS.