Merge "Fix 32-bit build"