some more changes for WIN32 compatibility