Ortographic corrections
(cherry-picked from 24b632e)