fix up some more templating issues