Merge "Fix typos spotted by Andreas."