MSVC 2010 fixes