Fix plugin aggregation