Updates for 32-bit build.