diff --git a/base/base_tests/buffer_vector_test.cpp b/base/base_tests/buffer_vector_test.cpp
index f9fd8f8130..b63d8b08b5 100644
--- a/base/base_tests/buffer_vector_test.cpp
+++ b/base/base_tests/buffer_vector_test.cpp
@@ -18,7 +18,7 @@ namespace
 
 UNIT_TEST(BufferVectorBounds)
 {
-  buffer_vector<int, 2> v;
+  buffer_vector<size_t, 2> v;
 
   for (size_t i = 0; i < 5; ++i)
   {
@@ -46,7 +46,7 @@ UNIT_TEST(BufferVectorBounds)
 
 UNIT_TEST(BufferVectorSwap)
 {
-  typedef buffer_vector<int, 2> value_t;
+  typedef buffer_vector<size_t, 2> value_t;
   buffer_vector<value_t, 2> v1, v2;
 
   for (size_t i = 0; i < 5; ++i)
@@ -67,7 +67,7 @@ UNIT_TEST(BufferVectorSwap)
   {
     v1[0].push_back(666);
 
-    int const * dd1 = v1[0].data();
+    auto const * dd1 = v1[0].data();
 
     // resize from 5 to 1 => v[0] will stay at the same place
     v1.resize(1);
@@ -86,7 +86,7 @@ UNIT_TEST(BufferVectorSwap)
 
     // inner dynamic buffer should be swapped during resizing
     // (??? but it's not specified by standart of std::vector ???)
-    int const * dd2 = v2[0].data();
+    auto const * dd2 = v2[0].data();
 
     v2.resize(1);
     TEST_EQUAL ( v2[0].size(), 5, () );
@@ -105,7 +105,7 @@ UNIT_TEST(BufferVectorSwap)
     for (size_t i = 0; i < 5; ++i)
       v3[0].push_back(i);
 
-    int const * dd3 = v3[0].data();
+    auto const * dd3 = v3[0].data();
 
     // resize from static to dynamic buffer => v3[0] will stay at the same place
     v1.resize(7);
@@ -153,7 +153,7 @@ UNIT_TEST(BufferVectorInsert)
 
         std::vector<int> dataToInsert(insertLength);
         for (size_t i = 0; i < insertLength; ++i)
-          dataToInsert[i] = 'a' + i;
+          dataToInsert[i] = 'a' + static_cast<int>(i);
 
         b.insert(b.begin() + insertPos, dataToInsert.begin(), dataToInsert.end());
         v.insert(v.begin() + insertPos, dataToInsert.begin(), dataToInsert.end());
@@ -211,7 +211,7 @@ UNIT_TEST(BufferVectorAppend)
 
       std::vector<int> dataToInsert(insertLength);
       for (size_t i = 0; i < insertLength; ++i)
-        dataToInsert[i] = 'a' + i;
+        dataToInsert[i] = 'a' + static_cast<int>(i);
 
       b.append(dataToInsert.begin(), dataToInsert.end());
       v.insert(v.end(), dataToInsert.begin(), dataToInsert.end());
@@ -226,7 +226,7 @@ UNIT_TEST(BufferVectorPopBack)
 {
   for (size_t len = 1; len < 6; ++len)
   {
-    buffer_vector<int, 3> v;
+    buffer_vector<size_t, 3> v;
     for (size_t i = 0; i < len; ++i)
       v.push_back(i);
     for (size_t i = len; i > 0; --i)
diff --git a/base/buffer_vector.hpp b/base/buffer_vector.hpp
index 28342a4619..e3565e6a26 100644
--- a/base/buffer_vector.hpp
+++ b/base/buffer_vector.hpp
@@ -384,7 +384,7 @@ public:
     size_t const n = end - beg;
     if (m_size + n <= N)
     {
-      if (pos != m_size)
+      if (static_cast<size_t>(pos) != m_size)
         for (ptrdiff_t i = m_size - 1; i >= pos; --i)
           Swap(m_static[i], m_static[i + n]);
 
diff --git a/coding/coding_tests/compressed_bit_vector_test.cpp b/coding/coding_tests/compressed_bit_vector_test.cpp
index 812a108a47..e70707fc3a 100644
--- a/coding/coding_tests/compressed_bit_vector_test.cpp
+++ b/coding/coding_tests/compressed_bit_vector_test.cpp
@@ -285,7 +285,7 @@ UNIT_TEST(CompressedBitVector_Union3)
 UNIT_TEST(CompressedBitVector_Union4)
 {
   vector<uint64_t> setBits1;
-  for (int i = 0; i < coding::DenseCBV::kBlockSize; ++i)
+  for (uint64_t i = 0; i < coding::DenseCBV::kBlockSize; ++i)
     setBits1.push_back(i);
 
   vector<uint64_t> setBits2 = {1000000000};
diff --git a/coding/coding_tests/file_container_test.cpp b/coding/coding_tests/file_container_test.cpp
index fa473a3802..9278d80fb4 100644
--- a/coding/coding_tests/file_container_test.cpp
+++ b/coding/coding_tests/file_container_test.cpp
@@ -289,7 +289,7 @@ UNIT_TEST(FilesMappingContainer_Smoke)
   {
     FilesContainerW writer(fName);
 
-    for (size_t i = 0; i < ARRAY_SIZE(key); ++i)
+    for (uint32_t i = 0; i < ARRAY_SIZE(key); ++i)
     {
       FileWriter w = writer.GetWriter(key[i]);
       for (uint32_t j = 0; j < count; ++j)
diff --git a/coding/file_writer.cpp b/coding/file_writer.cpp
index eafe6f2b77..61dd6ea2ae 100644
--- a/coding/file_writer.cpp
+++ b/coding/file_writer.cpp
@@ -23,12 +23,12 @@ FileWriter::~FileWriter()
   }
 }
 
-int64_t FileWriter::Pos() const
+uint64_t FileWriter::Pos() const
 {
   return m_pFileData->Pos();
 }
 
-void FileWriter::Seek(int64_t pos)
+void FileWriter::Seek(uint64_t pos)
 {
   ASSERT_GREATER_OR_EQUAL(pos, 0, ());
   m_pFileData->Seek(pos);
diff --git a/coding/file_writer.hpp b/coding/file_writer.hpp
index a3b9eb23d4..04f7919269 100644
--- a/coding/file_writer.hpp
+++ b/coding/file_writer.hpp
@@ -31,8 +31,8 @@ public:
                       Op operation = OP_WRITE_TRUNCATE, bool bTruncOnClose = false);
   ~FileWriter();
 
-  void Seek(int64_t pos);
-  int64_t Pos() const;
+  void Seek(uint64_t pos);
+  uint64_t Pos() const;
   void Write(void const * p, size_t size);
 
   void WritePaddingByEnd(size_t factor);
diff --git a/coding/multilang_utf8_string.cpp b/coding/multilang_utf8_string.cpp
index 3db26870f6..76d7c3cfa0 100644
--- a/coding/multilang_utf8_string.cpp
+++ b/coding/multilang_utf8_string.cpp
@@ -56,14 +56,14 @@ int8_t StringUtf8Multilang::GetLangIndex(string const & lang)
 // static
 char const * StringUtf8Multilang::GetLangByCode(int8_t langCode)
 {
-  if (langCode < 0 || langCode > g_languages.size() - 1)
+  if (langCode < 0 || langCode > static_cast<int8_t>(g_languages.size()) - 1)
     return "";
   return g_languages[langCode].m_code;
 }
 // static
 char const * StringUtf8Multilang::GetLangNameByCode(int8_t langCode)
 {
-  if (langCode < 0 || langCode > g_languages.size() - 1)
+  if (langCode < 0 || langCode > static_cast<int8_t>(g_languages.size()) - 1)
     return "";
   return g_languages[langCode].m_name;
 }
diff --git a/coding/writer.hpp b/coding/writer.hpp
index 9715388942..c7177499cd 100644
--- a/coding/writer.hpp
+++ b/coding/writer.hpp
@@ -21,8 +21,8 @@ public:
   DECLARE_EXCEPTION(CreateDirException, Exception);
 
   virtual ~Writer() {}
-  virtual void Seek(int64_t pos) = 0;
-  virtual int64_t Pos() const = 0;
+  virtual void Seek(uint64_t pos) = 0;
+  virtual uint64_t Pos() const = 0;
   virtual void Write(void const * p, size_t size) = 0;
 };
 
@@ -35,14 +35,14 @@ public:
     static_assert(sizeof(typename ContainerT::value_type) == 1, "");
   }
 
-  inline void Seek(int64_t pos)
+  inline void Seek(uint64_t pos)
   {
-    ASSERT_EQUAL(pos, static_cast<intptr_t>(pos), ());
+    ASSERT_EQUAL(pos, static_cast<uintptr_t>(pos), ());
     ASSERT_GREATER_OR_EQUAL(pos, 0, ());
-    m_Pos = static_cast<intptr_t>(pos);
+    m_Pos = static_cast<uintptr_t>(pos);
   }
 
-  inline int64_t Pos() const
+  inline uint64_t Pos() const
   {
     return m_Pos;
   }
@@ -69,7 +69,7 @@ public:
 
 private:
   ContainerT & m_Data;
-  size_t m_Pos;
+  uint64_t m_Pos;
 };
 
 // Original writer should not be used when SubWriter is active!
@@ -93,7 +93,7 @@ public:
       Seek(m_maxPos);
   }
 
-  inline void Seek(int64_t pos)
+  inline void Seek(uint64_t pos)
   {
     ASSERT_EQUAL(m_offset, GetOffset(), ());
     m_writer.Seek(GetOffset() + pos);
@@ -102,7 +102,7 @@ public:
     m_maxPos = max(m_maxPos, m_pos);
   }
 
-  inline int64_t Pos() const
+  inline uint64_t Pos() const
   {
     ASSERT_EQUAL(m_offset, GetOffset(), ());
     return m_pos;
@@ -120,14 +120,14 @@ public:
   inline uint64_t Size() const { return m_maxPos; }
 
 private:
-  inline int64_t GetOffset() const { return m_writer.Pos() - m_pos; }
+  inline uint64_t GetOffset() const { return m_writer.Pos() - m_pos; }
 
 private:
   WriterT & m_writer;
-  int64_t m_pos;
-  int64_t m_maxPos;
+  uint64_t m_pos;
+  uint64_t m_maxPos;
 #ifdef DEBUG
-  int64_t const m_offset;
+  uint64_t const m_offset;
 #endif
 };
 
@@ -137,12 +137,12 @@ class WriterPtr
 public:
   WriterPtr(WriterT * p = 0) : m_p(p) {}
 
-  void Seek(int64_t pos)
+  void Seek(uint64_t pos)
   {
     m_p->Seek(pos);
   }
 
-  int64_t Pos() const
+  uint64_t Pos() const
   {
     return m_p->Pos();
   }
@@ -172,5 +172,5 @@ public:
 
 private:
   WriterT & m_writer;
-  int64_t m_pos;
+  uint64_t m_pos;
 };
diff --git a/drape/attribute_provider.hpp b/drape/attribute_provider.hpp
index 6782358932..a5aa46ddfa 100644
--- a/drape/attribute_provider.hpp
+++ b/drape/attribute_provider.hpp
@@ -31,7 +31,7 @@ public:
   void UpdateStream(uint8_t streamIndex, ref_ptr<void> data);
 
 private:
-  int32_t m_vertexCount;
+  uint32_t m_vertexCount;
 
   struct AttributeStream
   {
diff --git a/drape/glyph_manager.cpp b/drape/glyph_manager.cpp
index efe2cecfdb..338a0db5d1 100644
--- a/drape/glyph_manager.cpp
+++ b/drape/glyph_manager.cpp
@@ -227,7 +227,7 @@ public:
         {
           size_t const dstBaseIndex = row * imageWidth + border;
           size_t const srcBaseIndex = (row - border) * bitmap.pitch;
-          for (size_t column = 0; column < bitmap.pitch; ++column)
+          for (int column = 0; column < bitmap.pitch; ++column)
             data->data()[dstBaseIndex + column] = bitmap.buffer[srcBaseIndex + column];
         }
       }
diff --git a/drape_frontend/drape_measurer.cpp b/drape_frontend/drape_measurer.cpp
index 18f95cbeb3..83adfa4752 100644
--- a/drape_frontend/drape_measurer.cpp
+++ b/drape_frontend/drape_measurer.cpp
@@ -14,7 +14,9 @@ void DrapeMeasurer::StartBenchmark()
   using namespace std::chrono;
   m_isEnabled = true;
 
-  auto currentTime = std::chrono::steady_clock::now();
+#if defined(GENERATING_STATISTIC) || defined(RENDER_STATISTIC) || defined(TRACK_GPU_MEM)
+  auto currentTime = steady_clock::now();
+#endif
 
 #ifdef GENERATING_STATISTIC
   m_startScenePreparingTime = currentTime;
diff --git a/drape_frontend/gps_track_renderer.cpp b/drape_frontend/gps_track_renderer.cpp
index d7494050f2..056d7eba8e 100644
--- a/drape_frontend/gps_track_renderer.cpp
+++ b/drape_frontend/gps_track_renderer.cpp
@@ -257,7 +257,7 @@ void GpsTrackRenderer::RenderTrack(ScreenBase const & screen, int zoomLevel,
                             pt.x + radiusMercator, pt.y + radiusMercator);
         if (screen.ClipRect().IsIntersect(pointRect))
         {
-          dp::Color const color = CalculatePointColor(static_cast<size_t>(it.GetIndex()), pt, it.GetLength(), it.GetFullLength());
+          dp::Color const color = CalculatePointColor(it.GetIndex(), pt, it.GetLength(), it.GetFullLength());
           m2::PointD const convertedPt = MapShape::ConvertToLocal(pt, m_pivot, kShapeCoordScalar);
           m_handlesCache[cacheIndex].first->SetPoint(m_handlesCache[cacheIndex].second, convertedPt, m_radius, color);
           m_handlesCache[cacheIndex].second++;
diff --git a/drape_frontend/traffic_generator.cpp b/drape_frontend/traffic_generator.cpp
index 399312cf09..f10c043cdf 100644
--- a/drape_frontend/traffic_generator.cpp
+++ b/drape_frontend/traffic_generator.cpp
@@ -26,28 +26,28 @@ namespace
 
 // Values of the following arrays are based on traffic-arrow texture.
 static array<float, static_cast<size_t>(traffic::SpeedGroup::Count)> kCoordVOffsets =
-{
-  0.75f, // G0
-  0.75f, // G1
-  0.75f, // G2
-  0.5f, // G3
-  0.25f, // G4
-  0.0f, // G5
-  0.75f, // TempBlock
-  0.0f, // Unknown
-};
+{{
+  0.75f,  // G0
+  0.75f,  // G1
+  0.75f,  // G2
+  0.5f,   // G3
+  0.25f,  // G4
+  0.0f,   // G5
+  0.75f,  // TempBlock
+  0.0f,   // Unknown
+}};
 
 static array<float, static_cast<size_t>(traffic::SpeedGroup::Count)> kMinCoordU =
-{
-  0.15f, // G0
-  0.15f, // G1
-  0.15f, // G2
-  0.33f, // G3
-  0.5f, // G4
-  0.0f, // G5
-  0.15f, // TempBlock
-  0.0f, // Unknown
-};
+{{
+  0.15f,  // G0
+  0.15f,  // G1
+  0.15f,  // G2
+  0.33f,  // G3
+  0.5f,   // G4
+  0.0f,   // G5
+  0.15f,  // TempBlock
+  0.0f,   // Unknown
+}};
 
 dp::BindingInfo const & GetTrafficStaticBindingInfo()
 {
@@ -90,7 +90,7 @@ void GenerateCapTriangles(glsl::vec3 const & pivot, vector<glsl::vec2> const & n
   float const kEps = 1e-5;
   glsl::vec4 const uv = glsl::vec4(glsl::ToVec2(colorRegion.GetTexRect().Center()), 0.0f, 0.0f);
   size_t const trianglesCount = normals.size() / 3;
-  for (int j = 0; j < trianglesCount; j++)
+  for (size_t j = 0; j < trianglesCount; j++)
   {
     SubmitStaticVertex(pivot, normals[3 * j],
                        glsl::length(normals[3 * j]) < kEps ? 0.0f : 1.0f, 0.0f, uv, staticGeometry);
diff --git a/drape_frontend/watch/cpu_drawer.cpp b/drape_frontend/watch/cpu_drawer.cpp
index f8eadd038b..499582ea32 100644
--- a/drape_frontend/watch/cpu_drawer.cpp
+++ b/drape_frontend/watch/cpu_drawer.cpp
@@ -710,7 +710,6 @@ void CPUDrawer::Draw(FeatureData const & data)
 
   bool const isPath = !data.m_pathes.empty();
   bool const isArea = !data.m_areas.empty();
-  bool isCircleAndSymbol = false;
 
   drule::BaseRule const * pSymbolRule = nullptr;
   double symbolDepth = df::watch::minDepth;
diff --git a/drape_frontend/watch/glyph_cache_impl.cpp b/drape_frontend/watch/glyph_cache_impl.cpp
index 7a531a39f0..29a5e905d1 100644
--- a/drape_frontend/watch/glyph_cache_impl.cpp
+++ b/drape_frontend/watch/glyph_cache_impl.cpp
@@ -282,8 +282,11 @@ void GlyphCacheImpl::addFont(char const * fileName)
         }
     }
 
-    if ((ubIt->m_coverage.back() >= 0) && (ubIt->m_coverage.back() < ubIt->m_end + 1 - ubIt->m_start))
+    if ((ubIt->m_coverage.back() >= 0) &&
+        (static_cast<strings::UniChar>(ubIt->m_coverage.back()) < ubIt->m_end + 1 - ubIt->m_start))
+    {
       ++ubIt->m_coverage.back();
+    }
     ++ccIt;
   }
 
diff --git a/drape_frontend/watch/point.h b/drape_frontend/watch/point.h
index 9c4c400749..c6ceca3f14 100644
--- a/drape_frontend/watch/point.h
+++ b/drape_frontend/watch/point.h
@@ -237,7 +237,7 @@ inline int segment(std::vector<point_base<T> > const & v, double length, double
   if (v.size() < 2)
     return -1;
 
-  int segment_num = 0;
+  size_t segment_num = 0;
   double segment_length = ml::distance(v[segment_num], v[segment_num + 1]);
   while ((length - segment_length >= 0) && (segment_num < v.size() - 1))
   {
@@ -247,7 +247,7 @@ inline int segment(std::vector<point_base<T> > const & v, double length, double
   }
   if (out_length)
     *out_length = length;
-  return segment_num;
+  return static_cast<int>(segment_num);
 }
 
 template <typename T>
diff --git a/drape_frontend/watch/text_engine.cpp b/drape_frontend/watch/text_engine.cpp
index 05b11d9e16..3b3cf15efd 100644
--- a/drape_frontend/watch/text_engine.cpp
+++ b/drape_frontend/watch/text_engine.cpp
@@ -134,7 +134,10 @@ void text::warp(std::vector<ml::point_d> const & path, ml::text_options const &
 void text::warp_text_line(text::string_range const & text_line,
                           std::vector<ml::point_d> const & path, ml::point_d & shift, bool flip)
 {
-  size_t segment_num = ml::segment(path, shift.x, &shift.x);
+  int segment_num = ml::segment(path, shift.x, &shift.x);
+
+  if (segment_num == -1)
+    return;
 
   double tt_angle = path.front().angle(path.back());
 
diff --git a/editor/opening_hours_ui.cpp b/editor/opening_hours_ui.cpp
index 7914d292bb..c05cc547b3 100644
--- a/editor/opening_hours_ui.cpp
+++ b/editor/opening_hours_ui.cpp
@@ -62,7 +62,7 @@ bool FixTimeSpans(osmoh::Timespan openingTime, osmoh::TTimespans & spans)
        });
 
   osmoh::TTimespans result{spans.front()};
-  for (auto i = 1, j = 0; i < spans.size(); ++i)
+  for (size_t i = 1, j = 0; i < spans.size(); ++i)
   {
     auto const start2 = spans[i].GetStart().GetHourMinutes().GetDuration();
     auto const end1 = spans[j].GetEnd().GetHourMinutes().GetDuration();
@@ -110,7 +110,7 @@ osmoh::Timespan GetLongetsOpenSpan(osmoh::Timespan const & openingTime,
     return openingTime;
 
   osmoh::Timespan longestSpan{openingTime.GetStart(), excludeTime.front().GetStart()};
-  for (auto i = 0; i < excludeTime.size() - 1; ++i)
+  for (size_t i = 0; i < excludeTime.size() - 1; ++i)
   {
     osmoh::Timespan nextOpenSpan{excludeTime[i].GetEnd(), excludeTime[i + 1].GetStart()};
     longestSpan = SpanLength(longestSpan) > SpanLength(nextOpenSpan) ? longestSpan : nextOpenSpan;
@@ -379,7 +379,7 @@ bool TimeTableSet::UpdateByIndex(TimeTableSet & ttSet, size_t const index)
   if (index >= ttSet.Size() || !updated.IsValid())
     return false;
 
-  for (auto i = 0; i < ttSet.Size(); ++i)
+  for (size_t i = 0; i < ttSet.Size(); ++i)
   {
     if (i == index)
       continue;
diff --git a/editor/ui2oh.cpp b/editor/ui2oh.cpp
index d7f3b317f9..592a686d53 100644
--- a/editor/ui2oh.cpp
+++ b/editor/ui2oh.cpp
@@ -59,7 +59,7 @@ void SetUpTimeTable(osmoh::TTimespans spans, editor::ui::TimeTable & tt)
 
   // Add an end of a span of index i and start of following span
   // as exclude time.
-  for (auto i = 0; i + 1 < spans.size(); ++i)
+  for (size_t i = 0; i + 1 < spans.size(); ++i)
     tt.AddExcludeTime({spans[i].GetEnd(), spans[i + 1].GetStart()});
 }
 
@@ -156,7 +156,7 @@ osmoh::TTimespans MakeTimespans(editor::ui::TimeTable const & tt)
 
   osmoh::TTimespans spans{{tt.GetOpeningTime().GetStart(), excludeTime[0].GetStart()}};
 
-  for (auto i = 0; i + 1 < excludeTime.size(); ++i)
+  for (size_t i = 0; i + 1 < excludeTime.size(); ++i)
     spans.emplace_back(excludeTime[i].GetEnd(), excludeTime[i + 1].GetStart());
 
   spans.emplace_back(excludeTime.back().GetEnd(), tt.GetOpeningTime().GetEnd());
diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp
index c8d181e866..47a9c1f388 100644
--- a/feature_list/feature_list.cpp
+++ b/feature_list/feature_list.cpp
@@ -267,7 +267,7 @@ int main(int argc, char ** argv)
     for (size_t ftIndex = 0; ftIndex < loader.GetNumFeatures(); ftIndex++)
     {
       FeatureType ft;
-      if (loader.GetFeatureByIndex(ftIndex, ft))
+      if (loader.GetFeatureByIndex(static_cast<uint32_t>(ftIndex), ft))
         doProcess.Process(ft);
     }
     doProcess.ClearCache();
diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp
index 1308ebc108..2a3b827084 100644
--- a/generator/altitude_generator.cpp
+++ b/generator/altitude_generator.cpp
@@ -177,7 +177,7 @@ void BuildRoadAltitudes(string const & mwmPath, AltitudeGetter & altitudeGetter)
     AltitudeHeader header;
     header.m_minAltitude = processor.GetMinAltitude();
 
-    int64_t const startOffset = w.Pos();
+    auto const startOffset = w.Pos();
     header.Serialize(w);
     {
       // Altitude availability serialization.
@@ -218,7 +218,7 @@ void BuildRoadAltitudes(string const & mwmPath, AltitudeGetter & altitudeGetter)
     header.m_endOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset);
 
     // Rewriting header info.
-    int64_t const endOffset = w.Pos();
+    auto const endOffset = w.Pos();
     w.Seek(startOffset);
     header.Serialize(w);
     w.Seek(endOffset);
diff --git a/generator/booking_dataset.cpp b/generator/booking_dataset.cpp
index 7a6d63b869..5abc35dad7 100644
--- a/generator/booking_dataset.cpp
+++ b/generator/booking_dataset.cpp
@@ -120,7 +120,7 @@ void BookingDataset::BuildObject(Object const & hotel,
     vector<string> parts;
     strings::ParseCSVRow(hotel.m_translations, '|', parts);
     CHECK_EQUAL(parts.size() % 3, 0, ("Invalid translation string:", hotel.m_translations));
-    for (auto i = 0; i < parts.size(); i += 3)
+    for (size_t i = 0; i < parts.size(); i += 3)
     {
       auto const langCode = StringUtf8Multilang::GetLangIndex(parts[i]);
       params.AddName(StringUtf8Multilang::GetLangByCode(langCode), parts[i + 1]);
diff --git a/generator/routing_generator.cpp b/generator/routing_generator.cpp
index a050068dca..477934197f 100644
--- a/generator/routing_generator.cpp
+++ b/generator/routing_generator.cpp
@@ -334,7 +334,7 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
       vector<IndexT> indices[2];
 
       // Match input segment points on feature points.
-      for (int j = 0; j < ft.GetPointsCount(); ++j)
+      for (size_t j = 0; j < ft.GetPointsCount(); ++j)
       {
         double const lon = MercatorBounds::XToLon(ft.GetPoint(j).x);
         double const lat = MercatorBounds::YToLat(ft.GetPoint(j).y);
@@ -420,7 +420,7 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
       int ind2 = -1;
       double dist1 = numeric_limits<double>::max();
       double dist2 = numeric_limits<double>::max();
-      for (int j = 0; j < ft.GetPointsCount(); ++j)
+      for (size_t j = 0; j < ft.GetPointsCount(); ++j)
       {
         double lon = MercatorBounds::XToLon(ft.GetPoint(j).x);
         double lat = MercatorBounds::YToLat(ft.GetPoint(j).y);
@@ -428,12 +428,12 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
         double const d2 = ms::DistanceOnEarth(pts[1].y, pts[1].x, lat, lon);
         if (d1 < dist1)
         {
-          ind1 = j;
+          ind1 = static_cast<int>(j);
           dist1 = d1;
         }
         if (d2 < dist2)
         {
-          ind2 = j;
+          ind2 = static_cast<int>(j);
           dist2 = d2;
         }
       }
diff --git a/geometry/covering.hpp b/geometry/covering.hpp
index 6e9597c3b9..eff30cb0ba 100644
--- a/geometry/covering.hpp
+++ b/geometry/covering.hpp
@@ -90,15 +90,16 @@ public:
 
   void Simplify()
   {
-    int cellsSimplified = 0;
-    int const initialSize = m_Size;
+    size_t cellsSimplified = 0;
+    auto const initialSize = m_Size;
     for (int level = CellId::DEPTH_LEVELS - 1; level > 1; --level)
     {
       if (m_Covering[level].size() >= 2)
       {
-        int const initialLevelSize = static_cast<int>(m_Covering[level].size());
+        auto const initialLevelSize = m_Covering[level].size();
         SimplifyLevel(level);
-        cellsSimplified += initialLevelSize - static_cast<int>(m_Covering[level].size());
+        ASSERT_GREATER_OR_EQUAL(initialLevelSize, m_Covering[level].size(), ());
+        cellsSimplified += initialLevelSize - m_Covering[level].size();
         if (cellsSimplified > initialSize / 2)
           break;
       }
@@ -216,7 +217,7 @@ private:
   void RemoveFullSquares()
   {
     vector<CellId> cellsToAppend;
-    for (int level = m_Covering.size() - 1; level >= 0; --level)
+    for (int level = static_cast<int>(m_Covering.size()) - 1; level >= 0; --level)
     {
       // a -> b + parents
       vector<CellId> const & a = m_Covering[level];
diff --git a/geometry/spline.cpp b/geometry/spline.cpp
index 0394b196be..a84b2dc6a6 100644
--- a/geometry/spline.cpp
+++ b/geometry/spline.cpp
@@ -181,7 +181,7 @@ double Spline::iterator::GetDistance() const
   return m_dist;
 }
 
-int Spline::iterator::GetIndex() const
+size_t Spline::iterator::GetIndex() const
 {
   return m_index;
 }
@@ -191,10 +191,8 @@ void Spline::iterator::AdvanceBackward(double step)
   m_dist += step;
   while(m_dist < 0.0f)
   {
-    m_index--;
-    if (m_index < 0)
+    if (m_index == 0)
     {
-      m_index = 0;
       m_checker = true;
       m_pos = m_spl->m_position[m_index];
       m_dir = m_spl->m_direction[m_index];
@@ -202,6 +200,10 @@ void Spline::iterator::AdvanceBackward(double step)
       m_dist = 0.0;
       return;
     }
+    else
+    {
+      --m_index;
+    }
 
     m_dist += m_spl->m_length[m_index];
   }
diff --git a/geometry/spline.hpp b/geometry/spline.hpp
index 1cd5fe9496..96e82760df 100644
--- a/geometry/spline.hpp
+++ b/geometry/spline.hpp
@@ -28,7 +28,7 @@ public:
     double GetLength() const;
     double GetFullLength() const;
 
-    int GetIndex() const;
+    size_t GetIndex() const;
 
   private:
     friend class Spline;
@@ -40,7 +40,7 @@ public:
   private:
     bool m_checker;
     Spline const * m_spl;
-    int m_index;
+    size_t m_index;
     double m_dist;
   };
 
@@ -64,7 +64,7 @@ public:
 
     f(begin.m_pos);
 
-    for (int i = begin.GetIndex() + 1; i <= end.GetIndex(); ++i)
+    for (size_t i = begin.GetIndex() + 1; i <= end.GetIndex(); ++i)
       f(m_position[i]);
 
     f(end.m_pos);
diff --git a/indexer/categories_index.cpp b/indexer/categories_index.cpp
index 29e41e74e8..af1513f314 100644
--- a/indexer/categories_index.cpp
+++ b/indexer/categories_index.cpp
@@ -52,7 +52,7 @@ namespace indexer
 {
 void CategoriesIndex::AddCategoryByTypeAndLang(uint32_t type, int8_t lang)
 {
-  ASSERT(lang >= 1 && lang <= CategoriesHolder::kLocaleMapping.size(),
+  ASSERT(lang >= 1 && lang <= static_cast<int8_t>(CategoriesHolder::kLocaleMapping.size()),
          ("Invalid lang code:", lang));
   m_catHolder->ForEachNameByType(type, [&](TCategory::Name const & name)
                                  {
@@ -69,7 +69,7 @@ void CategoriesIndex::AddCategoryByTypeAllLangs(uint32_t type)
 
 void CategoriesIndex::AddAllCategoriesInLang(int8_t lang)
 {
-  ASSERT(lang >= 1 && lang <= CategoriesHolder::kLocaleMapping.size(),
+  ASSERT(lang >= 1 && lang <= static_cast<int8_t>(CategoriesHolder::kLocaleMapping.size()),
          ("Invalid lang code:", lang));
   m_catHolder->ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat)
                                       {
diff --git a/indexer/centers_table.cpp b/indexer/centers_table.cpp
index 1659c6a83a..4b82d4be9a 100644
--- a/indexer/centers_table.cpp
+++ b/indexer/centers_table.cpp
@@ -277,7 +277,7 @@ void CentersTableBuilder::Freeze(Writer & writer) const
 {
   CentersTableV0::Header header;
 
-  int64_t const startOffset = writer.Pos();
+  auto const startOffset = writer.Pos();
   header.Write(writer);
 
   {
@@ -327,7 +327,7 @@ void CentersTableBuilder::Freeze(Writer & writer) const
     header.m_endOffset = base::checked_cast<uint32_t>(writer.Pos() - startOffset);
   }
 
-  int64_t const endOffset = writer.Pos();
+  auto const endOffset = writer.Pos();
 
   writer.Seek(startOffset);
   header.Write(writer);
diff --git a/indexer/displacement_manager.hpp b/indexer/displacement_manager.hpp
index 3520c3c3c2..396ca81753 100644
--- a/indexer/displacement_manager.hpp
+++ b/indexer/displacement_manager.hpp
@@ -122,14 +122,14 @@ public:
 
     for (auto const & node : m_storage)
     {
-      uint32_t scale = node.m_minScale;
+      auto scale = node.m_minScale;
       // Do not filter high level objects. Including metro and country names.
-      static size_t const maximumIgnoredZoom = feature::GetDrawableScaleRange(
+      static auto const maximumIgnoredZoom = feature::GetDrawableScaleRange(
         classif().GetTypeByPath({"railway", "station", "subway"})).first;
 
-      if (scale <= maximumIgnoredZoom)
+      if (maximumIgnoredZoom != -1 && scale <= maximumIgnoredZoom)
       {
-        AddNodeToSorter(node,scale);
+        AddNodeToSorter(node, static_cast<uint32_t>(scale));
         acceptedNodes.Add(node);
         continue;
       }
diff --git a/indexer/feature_impl.cpp b/indexer/feature_impl.cpp
index eda4428cde..04f4d18a7a 100644
--- a/indexer/feature_impl.cpp
+++ b/indexer/feature_impl.cpp
@@ -38,7 +38,7 @@ bool IsStreetNumber(strings::UniString const & s)
       bool flag = false;
       for (size_t j = 0; j < streetEndings[i].size(); ++j)
       {
-        if (streetEndings[i][j] != s[start + j])
+        if (streetEndings[i][j] != static_cast<char>(s[start + j]))
         {
           flag = true;
           break;
diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp
index f62faadafc..5149640729 100644
--- a/indexer/feature_loader.cpp
+++ b/indexer/feature_loader.cpp
@@ -214,10 +214,10 @@ uint32_t LoaderCurrent::ParseGeometry(int scale)
       ASSERT_LESS ( scaleIndex, m_Info.GetScalesCount(), () );
 
       points.push_back(m_pF->m_points.front());
-      for (int i = 1; i < count-1; ++i)
+      for (size_t i = 1; i < count - 1; ++i)
       {
         // check for point visibility in needed scaleIndex
-        if (((m_ptsSimpMask >> (2*(i-1))) & 0x3) <= scaleIndex)
+        if (static_cast<int>((m_ptsSimpMask >> (2 * (i - 1))) & 0x3) <= scaleIndex)
           points.push_back(m_pF->m_points[i]);
       }
       points.push_back(m_pF->m_points.back());
@@ -238,7 +238,7 @@ uint32_t LoaderCurrent::ParseTriangles(int scale)
   {
     if (m_pF->m_triangles.empty())
     {
-      uint32_t const ind = GetScaleIndex(scale, m_trgOffsets);
+      auto const ind = GetScaleIndex(scale, m_trgOffsets);
       if (ind != -1)
       {
         ReaderSource<FilesContainerR::TReader> src(m_Info.GetTrianglesReader(ind));
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 9f60ceba7e..27980c346d 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -428,7 +428,7 @@ unsigned IsHotelChecker::GetHotelTypesMask(FeatureType const & ft) const
 }
 
 // static
-char const * const IsHotelChecker::GetHotelTypeTag(Type type)
+char const * IsHotelChecker::GetHotelTypeTag(Type type)
 {
   switch (type)
   {
@@ -579,12 +579,12 @@ uint64_t GetPopulation(FeatureType const & ft)
   return population;
 }
 
-double GetRadiusByPopulation(uint32_t p)
+double GetRadiusByPopulation(uint64_t p)
 {
   return pow(static_cast<double>(p), 0.277778) * 550.0;
 }
 
-uint32_t GetPopulationByRadius(double r)
+uint64_t GetPopulationByRadius(double r)
 {
   return my::rounds(pow(r / 550.0, 3.6));
 }
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index dc0da449a7..623a73636e 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -182,7 +182,7 @@ public:
 
   static IsHotelChecker const & Instance();
 
-  static char const * const GetHotelTypeTag(Type type);
+  static char const * GetHotelTypeTag(Type type);
 
   unsigned GetHotelTypesMask(FeatureType const & ft) const;
 
@@ -245,8 +245,8 @@ public:
 /// @param r Radius in meters.
 //@{
 uint64_t GetPopulation(FeatureType const & ft);
-double GetRadiusByPopulation(uint32_t p);
-uint32_t GetPopulationByRadius(double r);
+double GetRadiusByPopulation(uint64_t p);
+uint64_t GetPopulationByRadius(double r);
 //@}
 
 /// Check if type conforms the path. Strings in the path can be
diff --git a/indexer/index.hpp b/indexer/index.hpp
index 077dc5bdf9..26feef5128 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -95,7 +95,7 @@ private:
       m_f(feature);
     }
 
-    void operator()(MwmHandle const & handle, covering::CoveringGetter & cov, uint32_t scale) const
+    void operator()(MwmHandle const & handle, covering::CoveringGetter & cov, int scale) const
     {
       MwmValue const * pValue = handle.GetValue<MwmValue>();
       if (pValue)
@@ -103,7 +103,7 @@ private:
         feature::DataHeader const & header = pValue->GetHeader();
 
         // Prepare needed covering.
-        uint32_t const lastScale = header.GetLastScale();
+        int const lastScale = header.GetLastScale();
 
         // In case of WorldCoasts we should pass correct scale in ForEachInIntervalAndScale.
         if (scale > lastScale)
@@ -167,7 +167,7 @@ private:
       m_f(fid);
     }
 
-    void operator()(MwmHandle const & handle, covering::CoveringGetter & cov, uint32_t scale) const
+    void operator()(MwmHandle const & handle, covering::CoveringGetter & cov, int scale) const
     {
       MwmValue const * pValue = handle.GetValue<MwmValue>();
       if (pValue)
@@ -208,21 +208,21 @@ private:
 public:
 
   template <typename F>
-  void ForEachInRect(F && f, m2::RectD const & rect, uint32_t scale) const
+  void ForEachInRect(F && f, m2::RectD const & rect, int scale) const
   {
     ReadMWMFunctor<F> implFunctor(f);
     ForEachInIntervals(implFunctor, covering::ViewportWithLowLevels, rect, scale);
   }
 
   template <typename F>
-  void ForEachFeatureIDInRect(F && f, m2::RectD const & rect, uint32_t scale) const
+  void ForEachFeatureIDInRect(F && f, m2::RectD const & rect, int scale) const
   {
     ReadFeatureIndexFunctor<F> implFunctor(f);
     ForEachInIntervals(implFunctor, covering::LowLevelsOnly, rect, scale);
   }
 
   template <typename F>
-  void ForEachInScale(F && f, uint32_t scale) const
+  void ForEachInScale(F && f, int scale) const
   {
     ReadMWMFunctor<F> implFunctor(f);
     ForEachInIntervals(implFunctor, covering::FullCover, m2::RectD::GetInfiniteRect(), scale);
@@ -297,7 +297,7 @@ public:
   };
 
   template <typename F>
-  void ForEachInRectForMWM(F && f, m2::RectD const & rect, uint32_t scale, MwmId const & id) const
+  void ForEachInRectForMWM(F && f, m2::RectD const & rect, int scale, MwmId const & id) const
   {
     MwmHandle const handle = GetMwmHandleById(id);
     if (handle.IsAlive())
@@ -312,7 +312,7 @@ private:
 
   template <typename F>
   void ForEachInIntervals(F && f, covering::CoveringMode mode, m2::RectD const & rect,
-                          uint32_t scale) const
+                          int scale) const
   {
     vector<shared_ptr<MwmInfo>> mwms;
     GetMwmsInfo(mwms);
diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp
index 5bc2698013..aec616c418 100644
--- a/indexer/indexer_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@@ -115,8 +115,9 @@ UNIT_TEST(CategoriesHolder_Smoke)
   for (size_t i = 0; i < mappings.size(); ++i)
   {
     auto const & mapping  = mappings[i];
-    TEST_EQUAL(i + 1, mapping.m_code, ());
-    TEST_EQUAL(i + 1, CategoriesHolder::MapLocaleToInteger(mapping.m_name), ());
+    TEST_EQUAL(static_cast<int8_t>(i + 1), mapping.m_code, ());
+    TEST_EQUAL(static_cast<int8_t>(i + 1),
+               CategoriesHolder::MapLocaleToInteger(mapping.m_name), ());
     TEST_EQUAL(CategoriesHolder::MapIntegerToLocale(i + 1), mapping.m_name, ());
   }
 }
diff --git a/indexer/indexer_tests/centers_table_test.cpp b/indexer/indexer_tests/centers_table_test.cpp
index 1e4fbbf16f..6874d26fa6 100644
--- a/indexer/indexer_tests/centers_table_test.cpp
+++ b/indexer/indexer_tests/centers_table_test.cpp
@@ -93,7 +93,7 @@ UNIT_CLASS_TEST(CentersTableTest, Subset)
     auto table = CentersTable::Load(reader, codingParams);
     TEST(table.get(), ());
 
-    size_t i = 0;
+    uint32_t i = 0;
     size_t j = 0;
 
     while (i < 100)
diff --git a/indexer/indexer_tests/osm_editor_test.cpp b/indexer/indexer_tests/osm_editor_test.cpp
index 27534b0c51..b0df3afaa9 100644
--- a/indexer/indexer_tests/osm_editor_test.cpp
+++ b/indexer/indexer_tests/osm_editor_test.cpp
@@ -120,7 +120,7 @@ template <typename T>
 uint32_t CountFeaturesInRect(MwmSet::MwmId const & mwmId, m2::RectD const & rect)
 {
   auto & editor = osm::Editor::Instance();
-  uint32_t unused = 0;
+  int unused = 0;
   uint32_t counter = 0;
   editor.ForEachFeatureInMwmRectAndScale(mwmId, [&counter](T const & ft)
   {
diff --git a/indexer/indexer_tests/succinct_trie_test.cpp b/indexer/indexer_tests/succinct_trie_test.cpp
index 92961d0ef7..003f06ca2d 100644
--- a/indexer/indexer_tests/succinct_trie_test.cpp
+++ b/indexer/indexer_tests/succinct_trie_test.cpp
@@ -159,8 +159,6 @@ UNIT_TEST(SuccinctTrie_Serialization_Smoke1)
 
   MemReader memReader(buf.data(), buf.size());
 
-  using TEmptyValue = EmptyValueReader::ValueType;
-
   auto trieRoot = trie::ReadSuccinctTrie(memReader, EmptyValueReader());
   TEST(trieRoot, ());
 }
@@ -178,8 +176,6 @@ UNIT_TEST(SuccinctTrie_Serialization_Smoke2)
 
   MemReader memReader(buf.data(), buf.size());
 
-  using TEmptyValue = EmptyValueReader::ValueType;
-
   auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());
   TEST(trieRoot, ());
 }
@@ -200,8 +196,6 @@ UNIT_TEST(SuccinctTrie_Iterator)
 
   MemReader memReader(buf.data(), buf.size());
 
-  using TEmptyValue = EmptyValueReader::ValueType;
-
   auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());
   TEST(trieRoot, ());
 
@@ -228,8 +222,6 @@ UNIT_TEST(SuccinctTrie_MoveToString)
   BuildFromSimpleValueList(memWriter, data);
   MemReader memReader(buf.data(), buf.size());
 
-  using TEmptyValue = EmptyValueReader::ValueType;
-
   auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());
 
   {
diff --git a/indexer/old/feature_loader_101.cpp b/indexer/old/feature_loader_101.cpp
index b7c58ff7c5..3cc54b07b6 100644
--- a/indexer/old/feature_loader_101.cpp
+++ b/indexer/old/feature_loader_101.cpp
@@ -374,10 +374,10 @@ uint32_t LoaderImpl::ParseGeometry(int scale)
       ASSERT_LESS ( scaleIndex, m_Info.GetScalesCount(), () );
 
       points.push_back(m_pF->m_points.front());
-      for (size_t i = 1; i < count-1; ++i)
+      for (size_t i = 1; i < count - 1; ++i)
       {
         // check for point visibility in needed scaleIndex
-        if (((m_ptsSimpMask >> (2*(i-1))) & 0x3) <= scaleIndex)
+        if (static_cast<int>((m_ptsSimpMask >> (2 * (i - 1))) & 0x3) <= scaleIndex)
           points.push_back(m_pF->m_points[i]);
       }
       points.push_back(m_pF->m_points.back());
@@ -398,7 +398,7 @@ uint32_t LoaderImpl::ParseTriangles(int scale)
   {
     if (m_pF->m_triangles.empty())
     {
-      uint32_t const ind = GetScaleIndex(scale, m_trgOffsets);
+      auto const ind = GetScaleIndex(scale, m_trgOffsets);
       if (ind != -1)
       {
         ReaderSource<FilesContainerR::TReader> src(m_Info.GetTrianglesReader(ind));
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index c384787f98..db2059c20e 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -548,7 +548,7 @@ bool Editor::RollBackChanges(FeatureID const & fid)
 void Editor::ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
                                              TFeatureIDFunctor const & f,
                                              m2::RectD const & rect,
-                                             uint32_t /*scale*/)
+                                             int /*scale*/)
 {
   auto const mwmFound = m_features.find(id);
   if (mwmFound == m_features.end())
@@ -568,7 +568,7 @@ void Editor::ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
 void Editor::ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
                                              TFeatureTypeFunctor const & f,
                                              m2::RectD const & rect,
-                                             uint32_t /*scale*/)
+                                             int /*scale*/)
 {
   auto mwmFound = m_features.find(id);
   if (mwmFound == m_features.end())
diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp
index 732d521466..2042727ec8 100644
--- a/indexer/osm_editor.hpp
+++ b/indexer/osm_editor.hpp
@@ -107,12 +107,12 @@ public:
   void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
                                        TFeatureIDFunctor const & f,
                                        m2::RectD const & rect,
-                                       uint32_t scale);
+                                       int scale);
   using TFeatureTypeFunctor = function<void(FeatureType &)>;
   void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
                                        TFeatureTypeFunctor const & f,
                                        m2::RectD const & rect,
-                                       uint32_t scale);
+                                       int scale);
 
   // TODO(mgsergio): Unify feature functions signatures.
 
diff --git a/indexer/scale_index.hpp b/indexer/scale_index.hpp
index 5a9a397544..a8104ac92e 100644
--- a/indexer/scale_index.hpp
+++ b/indexer/scale_index.hpp
@@ -17,7 +17,7 @@ class ScaleIndexBase
 {
 public:
   static uint32_t GetBucketsCount() { return 18; }
-  static uint32_t BucketByScale(uint32_t scale) { return scale; }
+  static uint32_t BucketByScale(int scale) { return static_cast<uint32_t>(scale); }
   /// @return Range like [x, y).
   static pair<uint32_t, uint32_t> ScaleRangeForBucket(uint32_t bucket)
   {
@@ -58,9 +58,9 @@ public:
   }
 
   template <typename F>
-  void ForEachInIntervalAndScale(F const & f, uint64_t beg, uint64_t end, uint32_t scale) const
+  void ForEachInIntervalAndScale(F const & f, uint64_t beg, uint64_t end, int scale) const
   {
-    size_t const scaleBucket = BucketByScale(scale);
+    auto const scaleBucket = BucketByScale(scale);
     if (scaleBucket < m_IndexForScale.size())
     {
       IntervalIndexIFace::FunctionT f1(cref(f));
diff --git a/indexer/scale_index_builder.hpp b/indexer/scale_index_builder.hpp
index d1a16a84b5..eb4fedce28 100644
--- a/indexer/scale_index_builder.hpp
+++ b/indexer/scale_index_builder.hpp
@@ -60,7 +60,7 @@ public:
       // This is not immediately obvious and in fact there was an idea to map
       // a bucket to a contiguous range of scales.
       // todo(@pimenov): We probably should remove scale_index.hpp altogether.
-      if (!FeatureShouldBeIndexed(ft, bucket, bucket == minScaleClassif /* needReset */))
+      if (!FeatureShouldBeIndexed(ft, static_cast<int>(bucket), bucket == minScaleClassif /* needReset */))
       {
         continue;
       }
@@ -82,7 +82,7 @@ private:
   //   -- it is allowed by the classificator.
   // If the feature is invisible at all scales, do not index it.
   template <class TFeature>
-  bool FeatureShouldBeIndexed(TFeature const & ft, uint32_t scale, bool needReset) const
+  bool FeatureShouldBeIndexed(TFeature const & ft, int scale, bool needReset) const
   {
     while (m_scalesIdx < m_header.GetScalesCount() && m_header.GetScale(m_scalesIdx) < scale)
     {
diff --git a/indexer/succinct_trie_builder.hpp b/indexer/succinct_trie_builder.hpp
index e42f2d5dcb..76a605b9e8 100644
--- a/indexer/succinct_trie_builder.hpp
+++ b/indexer/succinct_trie_builder.hpp
@@ -166,7 +166,7 @@ void BuildSuccinctTrie(TWriter & writer, TIter const beg, TIter const end)
     if (!node->m_isFinal)
       continue;
     finalNodeIds.push_back(static_cast<uint32_t>(i));
-    offsetTable.push_back(valueWriter.Pos());
+    offsetTable.push_back(static_cast<uint32_t>(valueWriter.Pos()));
     node->m_valueList.Dump(valueWriter);
   }
 
diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp
index 065ee94df1..68a6d13af2 100644
--- a/map/place_page_info.cpp
+++ b/map/place_page_info.cpp
@@ -190,16 +190,6 @@ banners::Banner Info::GetBanner() const
   return {Banner::Type::None, ""};
 }
 
-/// Deprecated, there was not only removed in order not to break the build.
-/// Should be removed in nearest time.
-///////////////////////////////////////////////////////////////////////////////
-string Info::GetBannerTitleId() const { return {}; }
-string Info::GetBannerMessageId() const { return {}; }
-string Info::GetBannerIconId() const { return {}; }
-string Info::GetBannerUrl() const { return {}; }
-string Info::GetBannerId() const { return {}; }
-///////////////////////////////////////////////////////////////////////////////
-
 bool Info::IsReachableByTaxi() const
 {
   return IsReachableByTaxiChecker::Instance()(m_types);
diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp
index 82c9d2082c..58930ec41c 100644
--- a/map/place_page_info.hpp
+++ b/map/place_page_info.hpp
@@ -82,15 +82,6 @@ public:
 
   bool HasBanner() const;
   banners::Banner GetBanner() const;
-  /// Deprecated, there was not only removed in order not to break the build.
-  /// Should be removed in nearest time.
-  ///////////////////////////////////////////////////////////////////////////////
-  string GetBannerTitleId() const;
-  string GetBannerMessageId() const;
-  string GetBannerIconId() const;
-  string GetBannerUrl() const;
-  string GetBannerId() const;
-  ///////////////////////////////////////////////////////////////////////////////
 
   bool IsReachableByTaxi() const;
 
diff --git a/openlr/openlr_simple_decoder.cpp b/openlr/openlr_simple_decoder.cpp
index 60322b86d6..2d90aa4712 100644
--- a/openlr/openlr_simple_decoder.cpp
+++ b/openlr/openlr_simple_decoder.cpp
@@ -117,7 +117,7 @@ OpenLRSimpleDecoder::OpenLRSimpleDecoder(string const & dataFilename, vector<Ind
 }
 
 void OpenLRSimpleDecoder::Decode(string const & outputFilename, int const segmentsToHandle,
-                                 SegmentsFilter const & filter, int const numThreads)
+                                 SegmentsFilter const & filter, uint32_t const numThreads)
 {
   // TODO(mgsergio): Feed segments directly to the decoder. Parsing should not
   // take place inside decoder process.
@@ -128,7 +128,8 @@ void OpenLRSimpleDecoder::Decode(string const & outputFilename, int const segmen
   my::EraseIf(segments,
               [&filter](LinearSegment const & segment) { return !filter.Matches(segment); });
 
-  if (segmentsToHandle != kHandleAllSegments && segmentsToHandle < segments.size())
+  if (segmentsToHandle != kHandleAllSegments && segmentsToHandle > 0 &&
+      static_cast<size_t>(segmentsToHandle) < segments.size())
     segments.resize(segmentsToHandle);
 
   sort(segments.begin(), segments.end(), my::LessBy(&LinearSegment::m_segmentId));
diff --git a/openlr/openlr_simple_decoder.hpp b/openlr/openlr_simple_decoder.hpp
index 977e109c2a..1693765aa0 100644
--- a/openlr/openlr_simple_decoder.hpp
+++ b/openlr/openlr_simple_decoder.hpp
@@ -38,7 +38,7 @@ public:
   OpenLRSimpleDecoder(std::string const & dataFilename, std::vector<Index> const & indexes);
 
   void Decode(std::string const & outputFilename, int segmentsToHandle,
-              SegmentsFilter const & filter, int numThreads);
+              SegmentsFilter const & filter, uint32_t numThreads);
 
 private:
   std::vector<Index> const & m_indexes;
diff --git a/openlr/openlr_stat/openlr_stat.cpp b/openlr/openlr_stat/openlr_stat.cpp
index f2448aa633..5823c5a492 100644
--- a/openlr/openlr_stat/openlr_stat.cpp
+++ b/openlr/openlr_stat/openlr_stat.cpp
@@ -108,12 +108,14 @@ int main(int argc, char * argv[])
 
   classificator::Load();
 
-  vector<Index> indexes(FLAGS_num_threads);
+  auto const num_threads = static_cast<uint32_t>(FLAGS_num_threads);
+
+  vector<Index> indexes(num_threads);
   LoadIndexes(FLAGS_mwms_path, indexes);
 
   OpenLRSimpleDecoder::SegmentsFilter filter(FLAGS_ids_path, FLAGS_multipoints_only);
   OpenLRSimpleDecoder decoder(FLAGS_input, indexes);
-  decoder.Decode(FLAGS_output, FLAGS_limit, filter, FLAGS_num_threads);
+  decoder.Decode(FLAGS_output, FLAGS_limit, filter, num_threads);
 
   return 0;
 }
diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp
index bc29764e54..07a8663898 100644
--- a/qt/editor_dialog.cpp
+++ b/qt/editor_dialog.cpp
@@ -91,7 +91,7 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
     if (emo.GetStreet().m_defaultName.empty())
       cmb->addItem("");
 
-    for (int i = 0; i < nearbyStreets.size(); ++i)
+    for (size_t i = 0; i < nearbyStreets.size(); ++i)
     {
       string street = nearbyStreets[i].m_defaultName;
       if (!nearbyStreets[i].m_localizedName.empty())
diff --git a/qt/traffic_mode.cpp b/qt/traffic_mode.cpp
index ce8b53ca44..198af76d02 100644
--- a/qt/traffic_mode.cpp
+++ b/qt/traffic_mode.cpp
@@ -129,7 +129,7 @@ int TrafficMode::rowCount(const QModelIndex & parent) const
 {
   if (!m_decodedSample)
     return 0;
-  return m_decodedSample->m_decodedItems.size();
+  return static_cast<int>(m_decodedSample->m_decodedItems.size());
 }
 
 int TrafficMode::columnCount(const QModelIndex & parent) const
diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp
index d46f150f1a..fa6d24382a 100644
--- a/routing/features_road_graph.cpp
+++ b/routing/features_road_graph.cpp
@@ -114,7 +114,7 @@ FeaturesRoadGraph::FeaturesRoadGraph(Index const & index, IRoadGraph::Mode mode,
 {
 }
 
-uint32_t FeaturesRoadGraph::GetStreetReadScale() { return scales::GetUpperScale(); }
+int FeaturesRoadGraph::GetStreetReadScale() { return scales::GetUpperScale(); }
 
 class CrossFeaturesLoader
 {
diff --git a/routing/features_road_graph.hpp b/routing/features_road_graph.hpp
index eec48784c9..a5e31040fd 100644
--- a/routing/features_road_graph.hpp
+++ b/routing/features_road_graph.hpp
@@ -63,7 +63,7 @@ public:
   FeaturesRoadGraph(Index const & index, IRoadGraph::Mode mode,
                     shared_ptr<VehicleModelFactory> vehicleModelFactory);
 
-  static uint32_t GetStreetReadScale();
+  static int GetStreetReadScale();
 
   // IRoadGraph overrides:
   RoadInfo GetRoadInfo(FeatureID const & featureId) const override;
diff --git a/routing/restrictions_serialization.hpp b/routing/restrictions_serialization.hpp
index 235645e1f5..33b472ca99 100644
--- a/routing/restrictions_serialization.hpp
+++ b/routing/restrictions_serialization.hpp
@@ -194,7 +194,7 @@ private:
           return false;
         }
 
-        uint32_t const delta = biasedDelta - 1;
+        uint32_t const delta = static_cast<uint32_t>(biasedDelta - 1);
         restriction.m_featureIds[i] =
             static_cast<uint32_t>(bits::ZigZagDecode(delta) + restriction.m_featureIds[i - 1]);
       }
diff --git a/search/features_filter.cpp b/search/features_filter.cpp
index 5f04345b6c..0065e8dcd4 100644
--- a/search/features_filter.cpp
+++ b/search/features_filter.cpp
@@ -8,7 +8,7 @@
 namespace search
 {
 // FeaturesFilter ----------------------------------------------------------------------------------
-FeaturesFilter::FeaturesFilter(CBV const & filter, uint32_t threshold)
+FeaturesFilter::FeaturesFilter(CBV const & filter, uint64_t threshold)
   : m_filter(filter), m_threshold(threshold)
 {
 }
@@ -32,7 +32,7 @@ CBV LocalityFilter::Filter(CBV const & cbv) const
 }
 
 // ViewportFilter ----------------------------------------------------------------------------------
-ViewportFilter::ViewportFilter(CBV const & filter, uint32_t threshold)
+ViewportFilter::ViewportFilter(CBV const & filter, uint64_t threshold)
   : FeaturesFilter(filter, threshold)
 {
 }
diff --git a/search/features_filter.hpp b/search/features_filter.hpp
index 8aaf27d782..02c76d1db4 100644
--- a/search/features_filter.hpp
+++ b/search/features_filter.hpp
@@ -12,7 +12,7 @@ class CBV;
 class FeaturesFilter
 {
 public:
-  FeaturesFilter(CBV const & filter, uint32_t threshold);
+  FeaturesFilter(CBV const & filter, uint64_t threshold);
 
   virtual ~FeaturesFilter() = default;
 
@@ -22,7 +22,7 @@ public:
 
 protected:
   CBV const & m_filter;
-  uint32_t const m_threshold;
+  uint64_t const m_threshold;
 };
 
 // Exact filter - leaves only features belonging to the set it was
@@ -44,7 +44,7 @@ public:
 class ViewportFilter : public FeaturesFilter
 {
 public:
-  ViewportFilter(CBV const & filter, uint32_t threshold);
+  ViewportFilter(CBV const & filter, uint64_t threshold);
 
   // FeaturesFilter overrides:
   CBV Filter(CBV const & cbv) const override;
diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp
index fd29a94e38..210885efa2 100644
--- a/search/locality_finder.cpp
+++ b/search/locality_finder.cpp
@@ -92,7 +92,7 @@ public:
       return;
     }
 
-    uint32_t const population = ftypes::GetPopulation(ft);
+    auto const population = ftypes::GetPopulation(ft);
     if (population == 0)
       return;
 
@@ -118,7 +118,7 @@ private:
 }  // namespace
 
 // LocalityItem ------------------------------------------------------------------------------------
-LocalityItem::LocalityItem(string const & name, m2::PointD const & center, uint32_t population)
+LocalityItem::LocalityItem(string const & name, m2::PointD const & center, uint64_t population)
   : m_name(name), m_center(center), m_population(population)
 {
 }
diff --git a/search/locality_finder.hpp b/search/locality_finder.hpp
index 75bbbeb80e..fffdd5d85d 100644
--- a/search/locality_finder.hpp
+++ b/search/locality_finder.hpp
@@ -20,11 +20,11 @@ class VillagesCache;
 
 struct LocalityItem
 {
-  LocalityItem(string const & name, m2::PointD const & center, uint32_t population);
+  LocalityItem(string const & name, m2::PointD const & center, uint64_t population);
 
   string m_name;
   m2::PointD m_center;
-  uint32_t m_population;
+  uint64_t m_population;
 };
 
 string DebugPrint(LocalityItem const & item);
diff --git a/search/result.cpp b/search/result.cpp
index 2d7c176ad2..99275a4eab 100644
--- a/search/result.cpp
+++ b/search/result.cpp
@@ -221,7 +221,7 @@ void Results::InsertResult(vector<Result>::iterator where, Result && result)
     r.SetPositionInResults(position + 1);
   }
 
-  result.SetPositionInResults(distance(m_results.begin(), where));
+  result.SetPositionInResults(static_cast<int32_t>(distance(m_results.begin(), where)));
   m_results.insert(where, move(result));
 }
 
diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/search/search_quality/search_quality_tool/search_quality_tool.cpp
index 05f3b26a8f..2989bb3f7d 100644
--- a/search/search_quality/search_quality_tool/search_quality_tool.cpp
+++ b/search/search_quality/search_quality_tool/search_quality_tool.cpp
@@ -39,6 +39,7 @@
 #include "std/fstream.hpp"
 #include "std/iomanip.hpp"
 #include "std/iostream.hpp"
+#include "std/limits.hpp"
 #include "std/map.hpp"
 #include "std/numeric.hpp"
 #include "std/sstream.hpp"
@@ -79,7 +80,7 @@ struct CompletenessQuery
   string m_query;
   unique_ptr<TestSearchRequest> m_request;
   string m_mwmName;
-  uint64_t m_featureId = 0;
+  uint32_t m_featureId = 0;
   double m_lat = 0;
   double m_lon = 0;
 };
@@ -197,17 +198,17 @@ void Split(string const & s, char delim, vector<string> & parts)
 
 // Returns the position of the result that is expected to be found by geocoder completeness
 // tests in the |result| vector or -1 if it does not occur there.
-int FindResult(TestSearchEngine & engine, string const & mwmName, uint64_t const featureId,
+int FindResult(TestSearchEngine & engine, string const & mwmName, uint32_t const featureId,
                double const lat, double const lon, vector<Result> const & results)
 {
+  CHECK_LESS_OR_EQUAL(results.size(), numeric_limits<int>::max(), ());
   auto const mwmId = engine.GetMwmIdByCountryFile(platform::CountryFile(mwmName));
   FeatureID const expectedFeatureId(mwmId, featureId);
   for (size_t i = 0; i < results.size(); ++i)
   {
     auto const & r = results[i];
-    auto const featureId = r.GetFeatureID();
-    if (featureId == expectedFeatureId)
-      return i;
+    if (r.GetFeatureID() == expectedFeatureId)
+      return static_cast<int>(i);
   }
 
   // Another attempt. If the queries are stale, feature id is useless.
@@ -222,7 +223,7 @@ int FindResult(TestSearchEngine & engine, string const & mwmName, uint64_t const
       double const dist = MercatorBounds::DistanceOnEarth(r.GetFeatureCenter(),
                                                           MercatorBounds::FromLatLon(lat, lon));
       LOG(LDEBUG, ("dist =", dist));
-      return i;
+      return static_cast<int>(i);
     }
   }
   return -1;
@@ -269,7 +270,7 @@ void ParseCompletenessQuery(string & s, CompletenessQuery & q)
 
   q.m_query = country + " " + city + " " + street + " " + house + " ";
   q.m_mwmName = mwmName;
-  q.m_featureId = featureId;
+  q.m_featureId = static_cast<uint32_t>(featureId);
   q.m_lat = lat;
   q.m_lon = lon;
 }
diff --git a/traffic/traffic_info.cpp b/traffic/traffic_info.cpp
index 6599b446cd..7af38e0536 100644
--- a/traffic/traffic_info.cpp
+++ b/traffic/traffic_info.cpp
@@ -437,7 +437,7 @@ TrafficInfo::ServerDataStatus TrafficInfo::ReceiveTrafficValues(string & etag, v
   if (!info)
     return ServerDataStatus::Error;
 
-  uint64_t const version = info->GetVersion();
+  auto const version = info->GetVersion();
   string const url = MakeRemoteURL(info->GetCountryName(), version);
 
   if (url.empty())
@@ -504,14 +504,14 @@ bool TrafficInfo::UpdateTrafficData(vector<SpeedGroup> const & values)
   return true;
 }
 
-TrafficInfo::ServerDataStatus TrafficInfo::ProcessFailure(platform::HttpClient const & request, uint64_t const mwmVersion)
+TrafficInfo::ServerDataStatus TrafficInfo::ProcessFailure(platform::HttpClient const & request, int64_t const mwmVersion)
 {
   switch (request.ErrorCode())
   {
   case 404: /* Not Found */
   {
-    uint64_t version = 0;
-    strings::to_uint64(request.ServerResponse().c_str(), version);
+    int64_t version = 0;
+    strings::to_int64(request.ServerResponse().c_str(), version);
 
     if (version > mwmVersion && version <= m_currentDataVersion)
       m_availability = Availability::ExpiredData;
diff --git a/traffic/traffic_info.hpp b/traffic/traffic_info.hpp
index 0dd75cb946..07a419c03e 100644
--- a/traffic/traffic_info.hpp
+++ b/traffic/traffic_info.hpp
@@ -143,7 +143,7 @@ private:
   // Updates the coloring and changes the availability status if needed.
   bool UpdateTrafficData(vector<SpeedGroup> const & values);
 
-  ServerDataStatus ProcessFailure(platform::HttpClient const & request, uint64_t const mwmVersion);
+  ServerDataStatus ProcessFailure(platform::HttpClient const & request, int64_t const mwmVersion);
 
   // The mapping from feature segments to speed groups (see speed_groups.hpp).
   Coloring m_coloring;