fixes for VC++