more unboxed aggregates touch-ups