Fix file names, etc.