Win32 changes/code cleanups