Tweaks to templates