more fixes for msvc 2010