MSVC 2010 build fixes, ( not 100% that's all of them )