fixes for win32