Fix templates for blaze