StraightLine final fixes