Fixed typos
Merged typos