minor changes for win32 support