minor typos
Merge branch 'next'