Merge "Fixed few typos"