Fix things broken by the merge.