Changes to waypoint nav.