Portablity fixes for VC.