Antt0000/issue740 segment

Desktop fixes to work with Segment changes.