minor Template tweaks