Small fixes to Segment sync