Fix typos
Merge