VS2010 build fixes.