Fixed some aggregation protocol issues.