Some labeling changes