adjustments to make the build run in 32 bit.