VS2008 Build fixes