Merge "Correct several typos"