Minor customizations to the templates