Correct file/template paths