Quick fixes for waypoints and controller.