Modifications for new VS2010 files