Minor fixes for win32