Fixed some labeling issues