Close migration to VS2010