Fix file and template paths