Fix offsets, aggregation