More fixes to windows project.