Ported typo fixes from #133.