More char trimming in filenames