diff --git a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
index 7773fd310..afde3180c 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
@@ -449,7 +449,7 @@ std::vector<Result> EmojiKeywords::LangPack::query(
 	}
 
 	const auto from = _data.emoji.lower_bound(normalized);
-	auto &&chosen = ranges::make_iterator_range(
+	auto &&chosen = ranges::subrange(
 		from,
 		end(_data.emoji)
 	) | ranges::view::take_while([&](const auto &pair) {
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index e4496e01d..129a7e028 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -764,7 +764,7 @@ void ApplyMegagroupAdmins(
 	}
 
 	auto adding = base::flat_map<UserId, QString>();
-	auto admins = ranges::make_iterator_range(
+	auto admins = ranges::subrange(
 		list.begin(), list.end()
 	) | ranges::view::transform([](const MTPChannelParticipant &p) {
 		const auto userId = p.match([](const auto &data) {
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index abf6b33a7..f485726c9 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2444,7 +2444,7 @@ MessageIdsList HistoryInner::getSelectedItems() const {
 		return {};
 	}
 
-	auto result = make_iterator_range(
+	auto result = ranges::subrange(
 		_selected.begin(),
 		_selected.end()
 	) | view::filter([](const auto &selected) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
index 886440199..87e1ca4d0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
@@ -34,6 +34,10 @@ struct PercentCounterItem {
 	int percent = 0;
 	int remainder = 0;
 
+	inline bool operator==(const PercentCounterItem &o) const {
+		return remainder == o.remainder && percent == o.percent;
+	}
+
 	inline bool operator<(const PercentCounterItem &other) const {
 		if (remainder > other.remainder) {
 			return true;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
index c1e1705d5..4eaf64887 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
@@ -291,7 +291,7 @@ auto Reader::Slice::prepareFill(int from, int till) -> PrepareFillResult {
 		ranges::less(),
 		&PartsMap::value_type::first);
 	const auto haveTill = FindNotLoadedStart(
-		ranges::make_iterator_range(start, finish),
+		ranges::subrange(start, finish),
 		fromOffset);
 	if (haveTill < till) {
 		result.offsetsFromLoader = offsetsFromLoader(
@@ -607,14 +607,14 @@ auto Reader::Slices::fill(int offset, bytes::span buffer) -> FillResult {
 		markSliceUsed(fromSlice);
 		CopyLoaded(
 			buffer,
-			ranges::make_iterator_range(first.start, first.finish),
+			ranges::subrange(first.start, first.finish),
 			firstFrom,
 			firstTill);
 		if (fromSlice + 1 < tillSlice) {
 			markSliceUsed(fromSlice + 1);
 			CopyLoaded(
 				buffer.subspan(firstTill - firstFrom),
-				ranges::make_iterator_range(second.start, second.finish),
+				ranges::subrange(second.start, second.finish),
 				secondFrom,
 				secondTill);
 		}
@@ -644,7 +644,7 @@ auto Reader::Slices::fillFromHeader(int offset, bytes::span buffer)
 	if (prepared.ready) {
 		CopyLoaded(
 			buffer,
-			ranges::make_iterator_range(prepared.start, prepared.finish),
+			ranges::subrange(prepared.start, prepared.finish),
 			from,
 			till);
 		result.filled = true;
diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp
index 4f3378fcb..0b6a6f71a 100644
--- a/Telegram/SourceFiles/ui/text/text_entity.cpp
+++ b/Telegram/SourceFiles/ui/text/text_entity.cpp
@@ -1141,7 +1141,7 @@ const QRegularExpression &RegExpWordSplit() {
 
 [[nodiscard]] QString ExpandCustomLinks(const TextWithTags &text) {
 	const auto entities = ConvertTextTagsToEntities(text.tags);
-	auto &&urls = ranges::make_iterator_range(
+	auto &&urls = ranges::subrange(
 		entities.begin(),
 		entities.end()
 	) | ranges::view::filter([](const EntityInText &entity) {
@@ -2098,7 +2098,7 @@ EntityInText::EntityInText(
 int EntityInText::FirstMonospaceOffset(
 		const EntitiesInText &entities,
 		int textLength) {
-	auto &&monospace = ranges::make_iterator_range(
+	auto &&monospace = ranges::subrange(
 		entities.begin(),
 		entities.end()
 	) | ranges::view::filter([](const EntityInText & entity) {