Fix some things that were undone in the merge conflict