diff --git a/indexer/index.hpp b/indexer/index.hpp
index d8172ea4fb..1a3f7b0c7c 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -227,8 +227,9 @@ private:
     // TODO: GetIndex(), Open() and Close() make Index single-threaded!
     IndexT * GetIndex(uint32_t scale, m2::RectD const & occlusionRect)
     {
-      if ((m_scaleRange.first <= scale && scale <= m_scaleRange.second) &&
-          m_Rect.IsIntersect(occlusionRect))
+      if ((m_scaleRange.first <= static_cast<int>(scale)
+           && static_cast<int>(scale) <= m_scaleRange.second)
+           && m_Rect.IsIntersect(occlusionRect))
       {
         Open();
         m_QueriesSkipped = 0;
@@ -245,7 +246,7 @@ private:
       }
     }
 
-    bool IsMyData(string path) const
+    bool IsMyData(string const & path) const
     {
       return m_Path == path;
     }
diff --git a/iphone/Maps/Settings/SettingsManager.mm b/iphone/Maps/Settings/SettingsManager.mm
index 198965b2b8..e12fca80c0 100644
--- a/iphone/Maps/Settings/SettingsManager.mm
+++ b/iphone/Maps/Settings/SettingsManager.mm
@@ -1,5 +1,6 @@
 #import "SettingsManager.h"
 #import "CountriesViewController.h"
+#import "MapViewController.h"
 
 #include "../../../storage/storage.hpp"
 
@@ -98,7 +99,7 @@ using namespace storage;
   //                    options:UIViewAnimationOptionTransitionCurlDown
   //                 completion:nil];
 
-  [m_prevController Invalidate];
+  [(MapViewController *)m_prevController Invalidate];
 
   m_storage = nil;
   [m_prevController release];