fixes for vc10