Fix file problems