Fixing Aggregators, preparing for a release