Even more fixes to Segment trees