Fixed tpl comments