Corrections in the templates