Fix metrics aggregation