Some grouping tweaks