Fix typos
Merge pull request #2868 from neo008:2.4