Nicer handling of filenames