More fixes for win32 fnames