A couple fixes for waypoints