Update VS2010 solution and minor fix