* Get everything to build on MS VS again