Minor edits to templates.