Minor adjustments for weird file names