Added better handling for max in flight.