Merge "Fixed typos and incorrect types"