fixes for MSVC10