Merge "fix typos"