Fix typos
Merge branch 'smashz-upstream'