Fixes from template checklist