Some 64-bit cleanups for Linux