diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dcdd96f64..e2053bd182 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,6 +313,7 @@ add_subdirectory(3party/gflags)
 add_subdirectory(3party/bsdiff-courgette)
 add_subdirectory(base)
 add_subdirectory(coding)
+add_subdirectory(generator/mwm_diff)
 add_subdirectory(geometry)
 add_subdirectory(platform)
 add_subdirectory(3party/opening_hours)
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index bc27d79212..5815608c6b 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -110,8 +110,6 @@ add_library(${PROJECT_NAME} ${SRC})
 omim_add_test_subdirectory(generator_tests_support)
 omim_add_test_subdirectory(generator_tests)
 
-add_subdirectory(mwm_diff)
-
 if (NOT SKIP_GTOOL)
   add_subdirectory(generator_tool)
 endif()
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 0b2d936470..f28b01f9df 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -6783,6 +6783,8 @@
 					"-llocal_ads",
 					"-lbsdiff",
 					"-lmwm_diff",
+					"-lugc",
+					"-lagg",
 				);
 				PRODUCT_NAME = "cm dbg";
 			};
@@ -6835,6 +6837,8 @@
 					"-llocal_ads",
 					"-lbsdiff",
 					"-lmwm_diff",
+					"-lugc",
+					"-lagg",
 				);
 				PRODUCT_NAME = "cm rel";
 			};
@@ -6887,6 +6891,8 @@
 					"-llocal_ads",
 					"-lbsdiff",
 					"-lmwm_diff",
+					"-lugc",
+					"-lagg",
 				);
 				PRODUCT_NAME = "cm dbg";
 			};
@@ -6939,6 +6945,8 @@
 					"-llocal_ads",
 					"-lbsdiff",
 					"-lmwm_diff",
+					"-lugc",
+					"-lagg",
 				);
 				PRODUCT_NAME = "cm beta";
 			};
@@ -6991,6 +6999,8 @@
 					"-llocal_ads",
 					"-lbsdiff",
 					"-lmwm_diff",
+					"-lugc",
+					"-lagg",
 				);
 				PRODUCT_NAME = "cm rel";
 			};
@@ -7043,6 +7053,8 @@
 					"-llocal_ads",
 					"-lbsdiff",
 					"-lmwm_diff",
+					"-lugc",
+					"-lagg",
 				);
 				PRODUCT_NAME = "cm pf";
 			};
diff --git a/iphone/Maps/run-script-for-cmake.sh b/iphone/Maps/run-script-for-cmake.sh
index 81bd37e2ef..dd87dcc18e 100755
--- a/iphone/Maps/run-script-for-cmake.sh
+++ b/iphone/Maps/run-script-for-cmake.sh
@@ -11,7 +11,7 @@ fi
 # Respect "Build for active arch only" project setting.
 if [[ "$ONLY_ACTIVE_ARCH" == YES ]]; then
   if [[ ! -z $CURRENT_ARCH ]]; then
-    VALID_ARCHS="$CURRENT_ARCH"
+    VALID_ARCHS=${ARCHS[0]}
   fi
 fi