Fix file issues