Fixes to templates.