Adjusting aggregator to handle logs better