Fixup the Windows and non-threaded builds

Merged Ondřej Surý requested to merge 289-fix-non-threaded-and-windows-builds into master

Merge request reports