Fixed some labeling