Merge typo fixes by Ilya Bizyaev