Fixed some Aggregate problems