Convert to msvc 2010