Fix the waypoints