Minor changes for win32