Fixes in Templating