Fixed a few typos
Merge heads