Fixed some issues in the templates.