Merge "Fix typos in code"