Updates to tmpl/includes