Minor fixes to the templates.