Finish fixing Aggregates