templating fix ups