Fixes to the templates.