Fixing up windows projects