more win32 fixes