Changes for 32-bit host