Fix some issues with labels in control groups

Fixes recent as well as some old breakage