Better handling of 64-bit offsets