More 64-bit fixes