Merge fixes from typos branch.