Minor improvements of labels