fixes for VC