issue #2826: Bug fixes for win32.