Fixed typos in the typo fix and merge