(MSVC 2010) Some build fixes