Fix 32-bit integer compatibility