Fixes to template from feedback