Merge "fix some typos"