diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 9e79f3ac2..a56e28b2f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -801,7 +801,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.fillRect(dialogsClip, currentBg());
 		}
 	} else if (_state == WidgetState::Filtered) {
-		auto top = 0;
+		[[maybe_unused]] auto top = 0;
 		if (!_hashtagResults.empty()) {
 			auto from = floorclamp(r.y(), st::mentionHeight, 0, _hashtagResults.size());
 			auto to = ceilclamp(r.y() + r.height(), st::mentionHeight, 0, _hashtagResults.size());
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.h b/Telegram/SourceFiles/dialogs/dialogs_key.h
index 2f631288e..8b5d22ed7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/qt/qt_compare.h"
+#include "data/data_message_reaction_id.h"
 
 class History;
 class PeerData;
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
index a8615ae11..24fc21507 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
@@ -56,9 +56,9 @@ FixedHashtagSearchQuery FixHashtagSearchQuery(
 		const QString &query,
 		int cursorPosition) {
 	const auto trimmed = query.trimmed();
-	const auto hash = trimmed.isEmpty()
+	const auto hash = int(trimmed.isEmpty()
 		? query.size()
-		: query.indexOf(trimmed);
+		: query.indexOf(trimmed));
 	const auto start = std::min(cursorPosition, hash);
 	auto result = query.mid(0, start);
 	for (const auto &ch : query.mid(start)) {
@@ -198,4 +198,4 @@ void ChatSearchTabs::paintEvent(QPaintEvent *e) {
 	QPainter(this).fillRect(e->rect(), st::dialogsBg);
 }
 
-} // namespace Dialogs
\ No newline at end of file
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index d3873d4f4..025b66cf8 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -733,7 +733,6 @@ void MainWidget::hideSingleUseKeyboard(FullMsgId replyToId) {
 void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
 	auto tags = Data::SearchTagsFromQuery(query);
 	if (controller()->isPrimary()) {
-		using Tab = Dialogs::ChatSearchTab;
 		auto state = Dialogs::SearchState{
 			.inChat = ((tags.empty() || inChat.sublist())
 				? inChat