diff --git a/Telegram/SourceFiles/codegen/style/generator.cpp b/Telegram/SourceFiles/codegen/style/generator.cpp
index 60799f10a..400e8bd21 100644
--- a/Telegram/SourceFiles/codegen/style/generator.cpp
+++ b/Telegram/SourceFiles/codegen/style/generator.cpp
@@ -127,7 +127,7 @@ QString stringToEncodedString(const QString &str) {
 		} else if (ch == '"' || ch == '\\') {
 			writingHexEscapedCharacters = false;
 			result.append('\\').append(ch);
-		} else if (ch < 32 || ch > 127) {
+		} else if (ch < 32 || static_cast<uchar>(ch) > 127) {
 			writingHexEscapedCharacters = true;
 			result.append("\\x").append(hexFirstChar(ch)).append(hexSecondChar(ch));
 		} else {
diff --git a/Telegram/SourceFiles/ui/twidget.h b/Telegram/SourceFiles/ui/twidget.h
index 36a27d35c..14fb5e71f 100644
--- a/Telegram/SourceFiles/ui/twidget.h
+++ b/Telegram/SourceFiles/ui/twidget.h
@@ -220,6 +220,9 @@ private:
 		return qobject_cast<const TWidget*>(Base::parentWidget());
 	}
 
+	template <typename OtherBase>
+	friend class TWidgetHelper;
+
 };
 
 class TWidget : public TWidgetHelper<QWidget> {
@@ -303,9 +306,6 @@ protected:
 		return height();
 	}
 
-	template <typename Base>
-	friend class TWidgetHelper;
-
 };
 
 template <typename Widget>