Other fixes for win32