Some more win32 fixes