Int64 unpack fixes