diff --git a/Telegram/SourceFiles/codegen/emoji/replaces.cpp b/Telegram/SourceFiles/codegen/emoji/replaces.cpp
index dedba9de1..298b421c3 100644
--- a/Telegram/SourceFiles/codegen/emoji/replaces.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/replaces.cpp
@@ -308,21 +308,21 @@ Replaces PrepareReplaces(const QString &filename) {
 	}
 	auto list = document.object();
 	for (auto i = list.constBegin(), e = list.constEnd(); i != e; ++i) {
-		if (!i->isObject()) {
+		if (!(*i).isObject()) {
 			logReplacesError(filename) << "Child object not found.";
 			return Replaces(filename);
 		}
 		auto childKey = i.key();
-		auto child = i->toObject();
+		auto child = (*i).toObject();
 		auto failed = false;
 		auto getString = [filename, childKey, &child, &failed](const QString &key) {
 			auto it = child.constFind(key);
-			if (it == child.constEnd() || !it->isString()) {
+			if (it == child.constEnd() || !(*it).isString()) {
 				logReplacesError(filename) << "Child '" << childKey.toStdString() << "' field not found: " << key.toStdString();
 				failed = true;
 				return QString();
 			}
-			return it->toString();
+			return (*it).toString();
 		};
 		auto idParts = getString("output").split('-');
 		auto name = getString("name");
diff --git a/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp b/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp
index b0b7d4021..ebe23cbd5 100644
--- a/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp
+++ b/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp
@@ -170,7 +170,7 @@ private:
 	private:
 		std::vector<small> &_map;
 		int _index = 0;
-		bool _guarded = false;
+		small _guarded = 0;
 
 	};
 	std::vector<small> _currentItemWordsUsedMap;