Merge "Minor typo fixes"