Fix labeling issues