More Win32 fixes ...
More Win32 fixes ...
More Win32 fixes.