Pick up changes to build for 64-bit.