improve 64-bit support