Tweaks to the templates.