Merge "Fixed several typos in the codebase"