Update to compile in VS2012