Win32 portability fixes

13 files changed