Small changes to template files