fixes for vc++