Fix aggregate calcs