win32 fixes added