Fix missing template errors