Merge "Correct a couple of typos"