Minor typos and grammar fixes
Fix newly introduced typo.
Land #4201, release fixes