Fix nits on templates.