Small changes to template