Fixed the templating issues