diff --git a/Telegram/SourceFiles/export/output/export_output_html.h b/Telegram/SourceFiles/export/output/export_output_html.h
index 75e75ccade..eb1bd7e681 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.h
+++ b/Telegram/SourceFiles/export/output/export_output_html.h
@@ -35,7 +35,7 @@ private:
 };
 
 struct UserpicData;
-struct PeersMap;
+class PeersMap;
 struct MediaData;
 
 } // namespace details
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
index 7321f44108..5db59b9dc1 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
@@ -463,7 +463,7 @@ void EditScans::setupSpecialScans(std::map<SpecialFile, ScanInfo> &&files) {
 			createSpecialScanRow(scan, scan.file, requiresBothSides);
 		}
 		auto label = scan.rowCreated.value(
-		) | rpl::map([=](bool created) {
+		) | rpl::map([=, type = type](bool created) {
 			return Lang::Viewer(uploadKey(type, created));
 		}) | rpl::flatten_latest(
 		) | Info::Profile::ToUpperValue();
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
index d22fa5de82..f959b65f0f 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -124,6 +124,12 @@
         'dependencies': [
           'utils.gyp:Packer',
         ],
+      }], [ 'build_mac', {
+        'mac_bundle': '1',
+        'mac_bundle_resources': [
+          '<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
+          '../Telegram/Images.xcassets',
+        ],
       }],
     ],
   }],
diff --git a/Telegram/gyp/telegram_mac.gypi b/Telegram/gyp/telegram_mac.gypi
index 43aabb0f8e..e1707f6afc 100644
--- a/Telegram/gyp/telegram_mac.gypi
+++ b/Telegram/gyp/telegram_mac.gypi
@@ -36,11 +36,6 @@
         },
       },
     },
-    'mac_bundle': '1',
-    'mac_bundle_resources': [
-      '<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
-      '../Telegram/Images.xcassets',
-    ],
   }], [ 'build_macold', {
     'xcode_settings': {
       'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],