Fix 64 bit portability issues.