Minor tweaks following meeting