Small changes in the templates.