Fix 32-bit issues