dev/win32-minor-fix