More adjustments for VC11