Slightly more correct aggregations