Fix typos that were introduced on merge.