Fixes some label (group) management issues