Merge "Fix typos and pointer math."