Fix typos
Merge branch 'sonata/master'