Fix grouping and ack statuses