Fix positioning for waypoints and wander_area