diff --git a/map/bookmark.cpp b/map/bookmark.cpp
index f8c4769755..e1ce232e75 100644
--- a/map/bookmark.cpp
+++ b/map/bookmark.cpp
@@ -136,19 +136,18 @@ void BookmarkCategory::DeleteBookmark(size_t index)
   ASSERT_LESS(index, c.GetUserMarkCount(), ());
   UserMark const * markForDelete = c.GetUserMark(index);
 
-  int animIndex = -1;
-  for (size_t i = 0; i < m_anims.size(); ++i)
+  size_t animIndex = 0;
+  for (; animIndex < m_anims.size(); ++animIndex)
   {
-    anim_node_t const & anim = m_anims[i];
+    anim_node_t const & anim = m_anims[animIndex];
     if (anim.first == markForDelete)
     {
       anim.second->Cancel();
-      animIndex = i;
       break;
     }
   }
 
-  if (animIndex != -1)
+  if (animIndex < m_anims.size())
     m_anims.erase(m_anims.begin() + animIndex);
 
   c.DeleteUserMark(index);
diff --git a/map/country_status_display.cpp b/map/country_status_display.cpp
index 09b589a4d2..040e0bf1a3 100644
--- a/map/country_status_display.cpp
+++ b/map/country_status_display.cpp
@@ -374,7 +374,7 @@ void CountryStatusDisplay::SetContentForProgress()
   ASSERT(m_label->isVisible(), ());
   int percent = 0;
   if (m_progressSize.second != 0)
-    percent = m_progressSize.first * 100 / m_progressSize.second;
+    percent = static_cast<int>(m_progressSize.first * 100 / m_progressSize.second);
   m_label->setText(FormatStatusMessage<string, int>("country_status_downloading", &m_displayMapName, &percent));
 }
 
diff --git a/map/ge0_parser.cpp b/map/ge0_parser.cpp
index 53e7ae0340..16ec7c4613 100644
--- a/map/ge0_parser.cpp
+++ b/map/ge0_parser.cpp
@@ -77,9 +77,10 @@ void Ge0Parser::DecodeLatLon(string const & url, double & lat, double & lon)
   lon = DecodeLonFromInt(lonInt, (1 << MAPSWITHME_MAX_COORD_BITS) - 1);
 }
 
-void Ge0Parser::DecodeLatLonToInt(string const & url, int & lat, int & lon, int const bytes)
+void Ge0Parser::DecodeLatLonToInt(string const & url, int & lat, int & lon, size_t const bytes)
 {
-  for(int i = 0, shift = MAPSWITHME_MAX_COORD_BITS - 3; i < bytes; ++i, shift -= 3)
+  int shift = MAPSWITHME_MAX_COORD_BITS - 3;
+  for(size_t i = 0; i < bytes; ++i, shift -= 3)
   {
     const uint8_t a = DecodeBase64Char(url[i]);
     const int lat1 =  (((a >> 5) & 1) << 2 |
diff --git a/map/ge0_parser.hpp b/map/ge0_parser.hpp
index 288ac0cd0f..7568cc5c74 100644
--- a/map/ge0_parser.hpp
+++ b/map/ge0_parser.hpp
@@ -19,7 +19,7 @@ protected:
   uint8_t DecodeBase64Char(char const c);
   static double DecodeZoom(uint8_t const zoomByte);
   void DecodeLatLon(string const & url, double & lat, double & lon);
-  void DecodeLatLonToInt(string const & url, int & lat, int & lon, int const bytes);
+  void DecodeLatLonToInt(string const & url, int & lat, int & lon, size_t const bytes);
   double DecodeLatFromInt(int const lat, int const maxValue);
   double DecodeLonFromInt(int const lon, int const maxValue);
   string DecodeName(string name);