Changes to work on Windows and with Occupier/Segment package mixup.