Fixed aggs and group bys that were singletons