Fixes for win32.