Minor fix on the templates