Fix typos
Merge pull request #1525 from fingolfin/typos

Fix typos