Fix Windows build

Sid Stenersenrequested to merge
slb/ss/win-build into master

Adresses multiple problems in building for Windows

Merge request reports