aggregates and dangerous queue fix

Change-Id: Id741891320aedcb19adc9156f720394dbec970b4