Minor tweaks for templates