agreggation fixes