fix template errors
Merge branch 'hotfix/fix_template_errors'