diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.h b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.h
index 39e606315d..22cf4d07cf 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.h
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.h
@@ -22,6 +22,6 @@
 
 - (void)updatePath:(CGFloat)progress;
 
-- (UIView *)buttonView;
+- (UIView * _Nullable)buttonView;
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
index 8bb1761189..a67431e7dd 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
@@ -209,7 +209,7 @@ CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progress - M_P
 
 #pragma mark - Properties
 
-- (UIView *)buttonView
+- (UIView * _Nullable)buttonView
 {
   return self.button;
 }
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
index 65dc7fe8ae..c6c4904cc5 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
@@ -133,6 +133,9 @@ using namespace taxi;
           self.type = MWMRoutePreviewTaxiCellTypeMaxim;
           providerName = kStatMaxim;
           break;
+        case taxi::Provider::Type::Count:
+          LOG(LERROR, ("Incorrect taxi provider"));
+          break;
         }
         [Statistics logEvent:kStatRoutingBuildTaxi withParameters:@{@"provider": providerName}];
         auto cv = self.collectionView;
@@ -164,6 +167,7 @@ using namespace taxi;
         case taxi::Provider::Type::Uber: provider = kStatUber; break;
         case taxi::Provider::Type::Yandex: provider = kStatYandex; break;
         case taxi::Provider::Type::Maxim: provider = kStatMaxim; break;
+        case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
         }
         NSString * errorValue = nil;
         switch (errorCode)
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index d29e924724..0405ef6d29 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -253,7 +253,7 @@ using namespace osm_auth_ios;
       auto const & request = f.GetParsedSearchRequest();
       auto manager = [MWMMapViewControlsManager manager];
 
-      auto query = [@((request.m_query + " ").c_str()) stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+      auto query = [@((request.m_query + " ").c_str()) stringByRemovingPercentEncoding];
       auto locale = @(request.m_locale.c_str());
 
       if (request.m_isSearchOnMap)
diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift
index 370e1ca234..2efd017980 100644
--- a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift
+++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift
@@ -92,7 +92,7 @@ final class AuthorizationViewController: MWMViewController {
 
   @IBAction private func phoneSignIn() {
     dismiss(animated: true) {
-      let url = ViewModel.phoneAuthURL()
+      let url = ViewModel.phoneAuthURL()!
       let wv = WebViewController(authURL: url, onSuccessAuth: { (token: String?) in
         self.process(token: token!, type: .phone)
       }, onFailure: {
diff --git a/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.h b/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.h
index 6dc8fa6ced..70e15b4512 100644
--- a/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.h
+++ b/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.h
@@ -18,7 +18,7 @@ typedef void (^MWMAuthorizationCompleteBlock)(BOOL);
 
 @interface MWMAuthorizationViewModel : NSObject
 
-+ (NSURL *)phoneAuthURL;
++ (NSURL * _Nullable)phoneAuthURL;
 + (void)checkAuthenticationWithSource:(MWMAuthorizationSource)source
                            onComplete:(MWMAuthorizationCompleteBlock _Nonnull)onComplete;
 + (BOOL)hasSocialToken;
diff --git a/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm b/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm
index d4eb440e9d..94318f1be5 100644
--- a/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm
+++ b/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm
@@ -9,7 +9,7 @@
 
 @implementation MWMAuthorizationViewModel
 
-+ (NSURL *)phoneAuthURL
++ (NSURL * _Nullable)phoneAuthURL
 {
   return [NSURL URLWithString:@(GetFramework().GetUser().GetPhoneAuthUrl("http://localhost").c_str())];
 }
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
index 44c4d8ef81..958f258464 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
@@ -101,6 +101,7 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
     case taxi::Provider::Uber: provider = kStatUber; break;
     case taxi::Provider::Yandex: provider = kStatYandex; break;
     case taxi::Provider::Maxim: provider = kStatMaxim; break;
+    case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
     }
     [Statistics logEvent:kStatPlacepageTaxiShow withParameters:@{ @"provider" : provider }];
   }
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
index 012011687f..833fcc5c8f 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@@ -121,6 +121,8 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
 
 #pragma mark - MWMBookmarksObserver
 
+- (void)onConversionFinish:(BOOL)success {}
+
 - (void)onBookmarkDeleted:(MWMMarkID)bookmarkId
 {
   auto data = self.data;
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
index caa07ad614..e8b289ae09 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
@@ -385,6 +385,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
       case taxi::Provider::Uber: type = MWMPlacePageTaxiProviderUber; break;
       case taxi::Provider::Yandex: type = MWMPlacePageTaxiProviderYandex; break;
       case taxi::Provider::Maxim: type = MWMPlacePageTaxiProviderMaxim; break;
+      case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
       }
       [c configWithType:type delegate:delegate];
       self.taxiCell = c;
@@ -626,6 +627,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
     case taxi::Provider::Uber: provider = kStatUber; break;
     case taxi::Provider::Yandex: provider = kStatYandex; break;
     case taxi::Provider::Maxim: provider = kStatMaxim; break;
+    case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
     }
     [Statistics logEvent:kStatPlacepageTaxiShow
           withParameters:@{kStatProvider: provider, kStatPlacement: kStatPlacePage}];
diff --git a/iphone/Maps/UI/Welcome/WelcomeProtocol.swift b/iphone/Maps/UI/Welcome/WelcomeProtocol.swift
index 2fd63dab93..17805d5f71 100644
--- a/iphone/Maps/UI/Welcome/WelcomeProtocol.swift
+++ b/iphone/Maps/UI/Welcome/WelcomeProtocol.swift
@@ -3,20 +3,20 @@ protocol WelcomeProtocolBase: AnyObject {
 
   var pageIndex: Int! { get set }
 
-  weak var pageController: WelcomePageController! { get set }
+  var pageController: WelcomePageController! { get set }
 
   func updateSize()
 
-  weak var image: UIImageView! { get set }
-  weak var alertTitle: UILabel! { get set }
-  weak var alertText: UILabel! { get set }
-  weak var nextPageButton: UIButton! { get set }
-  weak var containerWidth: NSLayoutConstraint! { get set }
-  weak var containerHeight: NSLayoutConstraint! { get set }
-  weak var imageMinHeight: NSLayoutConstraint! { get set }
-  weak var imageHeight: NSLayoutConstraint! { get set }
-  weak var titleTopOffset: NSLayoutConstraint! { get set }
-  weak var titleImageOffset: NSLayoutConstraint! { get set }
+  var image: UIImageView! { get set }
+  var alertTitle: UILabel! { get set }
+  var alertText: UILabel! { get set }
+  var nextPageButton: UIButton! { get set }
+  var containerWidth: NSLayoutConstraint! { get set }
+  var containerHeight: NSLayoutConstraint! { get set }
+  var imageMinHeight: NSLayoutConstraint! { get set }
+  var imageHeight: NSLayoutConstraint! { get set }
+  var titleTopOffset: NSLayoutConstraint! { get set }
+  var titleImageOffset: NSLayoutConstraint! { get set }
 }
 
 extension WelcomeProtocolBase {