Tweaks to segments