Some updates for working on 64-bit.