Win32 build fixes
Merge pull request #273 from tribal-tec/master

Win32 build fixes