various aggregation hotfix