put win32 fixes back