VS2010 buildfixes