Minor changes to template