Fix the Windows build (broken in 315a8ba)
Merge pull request #116 from Tilka/misc_fixes_fix

Fix the Windows build (broken in 315a8ba)