fixes in aggregator