Update for 3.5.4

Not tested: whether the 64-bit offset for the device is correct in the 3.5.4 version