Fixed minor issues in template.xml