Fix typos (found by Francesco Pompò)

Manually merging as the pull requests are based on an old branch.

closes #215
closes #216
2 files changed