Update for newer versions of VCC