Correcting minor bugs with the templates.