diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
index 810405c93..5dbf0705f 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
@@ -56,12 +56,12 @@ public:
 
 class ItemBase : public LayoutItemBase {
 public:
-	ItemBase(gsl::not_null<Context*> context, Result *result) : _context(context), _result(result) {
+	ItemBase(gsl::not_null<Context*> context, Result *result) : _result(result), _context(context) {
 	}
-	ItemBase(gsl::not_null<Context*> context, DocumentData *doc) : _context(context), _doc(doc) {
+	ItemBase(gsl::not_null<Context*> context, DocumentData *doc) : _doc(doc), _context(context) {
 	}
 	// Not used anywhere currently.
-	//ItemBase(gsl::not_null<Context*> context, PhotoData *photo) : _context(context), _photo(photo) {
+	//ItemBase(gsl::not_null<Context*> context, PhotoData *photo) : _photo(photo), _context(context) {
 	//}
 
 	virtual void paint(Painter &p, const QRect &clip, const PaintContext *context) const = 0;
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index 9b702507a..d49298596 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -406,7 +406,8 @@ int Inner::refreshInlineRows(UserData *bot, const CacheEntry *entry, bool result
 		}
 		return false;
 	};
-	if (clearResults()) {
+	auto clearResultsResult = clearResults(); // Clang workaround.
+	if (clearResultsResult) {
 		if (resultsDeleted) {
 			clearInlineRows(true);
 			deleteUnusedInlineLayouts();
diff --git a/Telegram/SourceFiles/stickers/emoji_list_widget.cpp b/Telegram/SourceFiles/stickers/emoji_list_widget.cpp
index 8c0aba93e..2c552a26e 100644
--- a/Telegram/SourceFiles/stickers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/stickers/emoji_list_widget.cpp
@@ -54,7 +54,7 @@ private:
 
 EmojiListWidget::Footer::Footer(gsl::not_null<EmojiListWidget*> parent) : InnerFooter(parent)
 , _pan(parent)
-, _sections {
+, _sections { {
 	object_ptr<Ui::IconButton>(this, st::emojiCategoryRecent),
 	object_ptr<Ui::IconButton>(this, st::emojiCategoryPeople),
 	object_ptr<Ui::IconButton>(this, st::emojiCategoryNature),
@@ -63,7 +63,7 @@ EmojiListWidget::Footer::Footer(gsl::not_null<EmojiListWidget*> parent) : InnerF
 	object_ptr<Ui::IconButton>(this, st::emojiCategoryTravel),
 	object_ptr<Ui::IconButton>(this, st::emojiCategoryObjects),
 	object_ptr<Ui::IconButton>(this, st::emojiCategorySymbols),
-} {
+} } {
 	auto left = (st::emojiPanWidth - _sections.size() * st::emojiCategory.width) / 2;
 	for (auto i = 0; i != _sections.size(); ++i) {
 		auto &button = _sections[i];
@@ -79,7 +79,7 @@ void EmojiListWidget::Footer::processPanelHideFinished() {
 }
 
 void EmojiListWidget::Footer::setCurrentSectionIcon(Section section) {
-	std::array<const style::icon *, kEmojiSectionCount> overrides = {
+	std::array<const style::icon *, kEmojiSectionCount> overrides = { {
 		&st::emojiRecentActive,
 		&st::emojiPeopleActive,
 		&st::emojiNatureActive,
@@ -88,7 +88,7 @@ void EmojiListWidget::Footer::setCurrentSectionIcon(Section section) {
 		&st::emojiTravelActive,
 		&st::emojiObjectsActive,
 		&st::emojiSymbolsActive,
-	};
+	} };
 	for (auto i = 0; i != _sections.size(); ++i) {
 		_sections[i]->setIconOverride((section == static_cast<Section>(i)) ? overrides[i] : nullptr);
 	}
diff --git a/Telegram/SourceFiles/stickers/emoji_panel.cpp b/Telegram/SourceFiles/stickers/emoji_panel.cpp
index 946088841..75b631b84 100644
--- a/Telegram/SourceFiles/stickers/emoji_panel.cpp
+++ b/Telegram/SourceFiles/stickers/emoji_panel.cpp
@@ -280,15 +280,15 @@ void EmojiPanel::Tab::saveScrollTop() {
 }
 
 EmojiPanel::EmojiPanel(QWidget *parent) : TWidget(parent)
-, _scroll(this, st::emojiScroll)
 , _tabsSlider(this, st::emojiTabs)
 , _topShadow(this, st::shadowFg)
 , _bottomShadow(this, st::shadowFg)
-, _tabs {
+, _scroll(this, st::emojiScroll)
+, _tabs { {
 	Tab { TabType::Emoji, object_ptr<EmojiListWidget>(this) },
 	Tab { TabType::Stickers, object_ptr<StickersListWidget>(this) },
 	Tab { TabType::Gifs, object_ptr<GifsListWidget>(this) },
-}
+} }
 , _currentTabType(AuthSession::Current().data().emojiPanelTab()) {
 	resize(QRect(0, 0, st::emojiPanWidth, st::emojiPanMaxHeight).marginsAdded(innerPadding()).size());
 	_width = width();
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
index a32122103..c12e450b0 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -106,6 +106,7 @@
               'fontconfig',
               'expat',
               'freetype',
+              'z',
               'xcb-shm',
               'xcb-xfixes',
               'xcb-render',