re-applying win32 changes