vc compatibility fixes