Correct typos
Cleanup type mismatches