Fixing compiler issues on win32