Refix the things that were lost in the merge.