Minor fixes on the template