Merge "Fix common typos"