More fixes with pathing