Fix typos generated from merge with older codebase