Better handling of file names and sets with utf8 names.