Some tweaks for 32-bit Linux build