Resolve "Two typos corrected by Carsten"
Closes #1514 (closed) (this is a rebase of !981 (closed). I didn't want to force push to Carsten's repo.
Closes #1514 (closed) (this is a rebase of !981 (closed). I didn't want to force push to Carsten's repo.