Fix a few mistakes from the merge.