Minor typos - port of #317