Fix file path issues