Merge "Fixes a couple of typos."