Data aggregation fixes.