Fix up grouping and labels