[Cleanup] Fix typos that caused type mismatches on 32-bit platforms.