Fix some labeling