Fix the AppVeyor build errors

Plus some minor project file cleanup.

And that's about it. :+1: