Some more fixes to get running on Visual Studio

I finally got a VM with Windows and VS set up, so I can guarantee that
this now "works"