Minor mods to templates