Add first pass of 64-bit support