Minor changes in templates.