Fix typos after merge