More attempts to assure unicode file names are properly cleaned