Fix ups from review