Waypoints corrections