Address all the late feedback that came in after the merge.