Merge typo fixes.