Fixed some labeling issues.