(MSVC) Some MSVC 2010 compatibility fixes