Fix more helpers in template