Fix some typos introduced when merging `master`