Minor tweaks to templates