CLSN-308: label fixes