[DF-3341], [DF-3342] - Aggregator fixes.