Build updates for VS2010 and linux.