Fixes for path of template files