Fix up from review