Adjusted some templates.