Merge "Fix typos and missing space"