Fix 32-bit issues #2