Last broken-test fixes (Labels and LabelSets)