Fix waypoints