Fixed more templating issues