Fix segment_first/object_first mismatch