Fix all Templating Issues