diff --git a/Telegram/SourceFiles/codegen/lang/generator.cpp b/Telegram/SourceFiles/codegen/lang/generator.cpp
index deb42bb79..87c6d90b5 100644
--- a/Telegram/SourceFiles/codegen/lang/generator.cpp
+++ b/Telegram/SourceFiles/codegen/lang/generator.cpp
@@ -209,7 +209,7 @@ using S = std::decay_t<decltype(std::declval<P>()(QString()))>;\n\
 template <typename ...Tags>\n\
 struct phrase;\n\
 \n";
-	std::set<QStringList> producersDeclared;
+	std::set<QString> producersDeclared;
 	for (auto &entry : langpack_.entries) {
 		const auto isPlural = !entry.keyBase.isEmpty();
 		const auto &key = entry.key;
@@ -238,7 +238,7 @@ struct phrase;\n\
 		}
 		producerArgs.push_back("P p = P()");
 		currentArgs.push_back("P p = P()");
-		if (!producersDeclared.emplace(tags).second) {
+		if (!producersDeclared.emplace(tags.join(',')).second) {
 			continue;
 		}
 		header_->stream() << "\
diff --git a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
index 7b54d278f..db2c10773 100644
--- a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
+++ b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm
@@ -136,12 +136,14 @@ NSImage *CreateNSImageFromEmoji(EmojiPtr emoji) {
 	pixmap.fill(Qt::black);
 	Painter paint(&pixmap);
 	PainterHighQualityEnabler hq(paint);
+#ifndef OS_MAC_OLD
 	Ui::Emoji::Draw(
 		paint,
 		std::move(emoji),
 		Ui::Emoji::GetSizeTouchbar(),
 		0,
 		0);
+#endif // OS_MAC_OLD
 	return [qt_mac_create_nsimage(pixmap) autorelease];
 }