More minor changes to template