Some changes in templates.