Labeling fixes