more adjustments for 32-bit