more WIN32 fixes