diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
index eba63eeabe..c9c4428a29 100644
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
@@ -40,7 +40,7 @@
   return [self.manager getServerId:self.categoryId];
 }
 
-- (NSString *)imageUrl {
+- (NSURL *)imageUrl {
   return [self.manager getCategoryImageUrl:self.categoryId];
 }
 
diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.m b/iphone/Maps/Categories/UIColor+MapsMeColor.m
index 3891ba1e11..905a07b01d 100644
--- a/iphone/Maps/Categories/UIColor+MapsMeColor.m
+++ b/iphone/Maps/Categories/UIColor+MapsMeColor.m
@@ -6,10 +6,6 @@ static BOOL isNightMode = NO;
 static NSDictionary<NSString *, UIColor *> *day;
 static NSDictionary<NSString *, UIColor *> *night;
 
-static UIColor * color(SEL cmd) {
-  return (isNightMode ? night : day)[NSStringFromSelector(cmd)];
-}
-
 @implementation UIColor (MapsMeColor)
 
 + (void)load {
diff --git a/iphone/Maps/Classes/Components/MWMButton.m b/iphone/Maps/Classes/Components/MWMButton.m
index 1be85cc002..d807c815a0 100644
--- a/iphone/Maps/Classes/Components/MWMButton.m
+++ b/iphone/Maps/Classes/Components/MWMButton.m
@@ -12,11 +12,12 @@ static NSString * const kSelectedPattern = @"%@_selected_%@";
   [self setDefaultImages];
 }
 
-- (void)applyTheme
-{
-  [self changeColoringToOpposite];
-  [super applyTheme];
-}
+// This method is overridden by MWMButtonRenderer.swift
+//- (void)applyTheme
+//{
+//  [self changeColoringToOpposite];
+//  [super applyTheme];
+//}
 
 - (void)setColoring:(MWMButtonColoring)coloring
 {
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
index 9f1e0d9f35..f8abbd3be2 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
@@ -8,6 +8,7 @@
 #include "base/logging.hpp"
 #include "editor/osm_auth.hpp"
 
+#import <WebKit/WKNavigationDelegate.h>
 #import <WebKit/WKWebView.h>
 
 using namespace osm;
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 7ea7b09554..ec49d50680 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -454,6 +454,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
   auto const todo = GetFramework().ToDoAfterUpdate();
 
   switch (todo) {
+    case Framework::DoAfterUpdate::Migrate:
     case Framework::DoAfterUpdate::Nothing:
       break;
     case Framework::DoAfterUpdate::AutoupdateMaps:
diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.h b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.h
index e399e1adac..dd243d93b6 100644
--- a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.h
+++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.h
@@ -26,7 +26,6 @@ NS_SWIFT_NAME(RoutingManager)
 @property(nonatomic, readonly) MWMRouterType type;
 @property(nonatomic) MWMSpeedCameraManagerMode speedCameraMode;
 
-- (instancetype)init NS_UNAVAILABLE;
 - (void)addListener:(id<MWMRoutingManagerListener>)listener;
 - (void)removeListener:(id<MWMRoutingManagerListener>)listener;
 
diff --git a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm
index 4ba3f3bee9..c6ad56906d 100644
--- a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm
+++ b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm
@@ -38,6 +38,8 @@ struct BaseCellStategy
   virtual NSString * TitleForHeader() const { return nil; }
 
   virtual size_t NumberOfRows(MWMTTSSettingsViewController * /* controller */) const { return 1; }
+
+  virtual ~BaseCellStategy() {}
 };
 
 struct VoiceInstructionCellStrategy : BaseCellStategy