Changes for Visual Studio 2010 build.