diff --git a/base/base_tests/stl_helpers_test.cpp b/base/base_tests/stl_helpers_test.cpp
index 424007c40f..59f8315455 100644
--- a/base/base_tests/stl_helpers_test.cpp
+++ b/base/base_tests/stl_helpers_test.cpp
@@ -91,7 +91,7 @@ UNIT_TEST(LessBy)
 
     std::vector<Value> v = {{2, 2}, {0, 4}, {3, 1}, {4, 0}, {1, 3}};
     std::sort(v.begin(), v.end(), my::LessBy(&Value::first));
-    for (size_t i = 0; i < v.size(); ++i)
+    for (int i = 0; i < static_cast<int>(v.size()); ++i)
       TEST_EQUAL(i, v[i].first, ());
 
     std::vector<Value const *> pv;
@@ -99,7 +99,7 @@ UNIT_TEST(LessBy)
       pv.push_back(&p);
 
     std::sort(pv.begin(), pv.end(), my::LessBy(&Value::second));
-    for (size_t i = 0; i < pv.size(); ++i)
+    for (int i = 0; i < static_cast<int>(pv.size()); ++i)
       TEST_EQUAL(i, pv[i]->second, ());
   }
 
diff --git a/base/levenshtein_dfa.cpp b/base/levenshtein_dfa.cpp
index 9c0b09b00c..82da404b61 100644
--- a/base/levenshtein_dfa.cpp
+++ b/base/levenshtein_dfa.cpp
@@ -8,6 +8,7 @@
 #include <set>
 #include <sstream>
 #include <vector>
+#include <iterator>
 
 namespace strings
 {
@@ -200,7 +201,9 @@ LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixSize,
   m_alphabet.assign(s.begin(), s.end());
   CHECK_LESS_OR_EQUAL(prefixSize, s.size(), ());
 
-  for (auto it = s.begin(); std::distance(it, s.begin()) < prefixSize; ++it)
+  auto pSize = static_cast<typename std::iterator_traits<
+          UniString::iterator>::difference_type>(prefixSize);
+  for (auto it = s.begin(); std::distance(it, s.begin()) < pSize; ++it)
   {
     for (auto const & misprints : prefixMisprints)
     {
diff --git a/coding/diff.hpp b/coding/diff.hpp
index 4287df422a..91e7c55432 100644
--- a/coding/diff.hpp
+++ b/coding/diff.hpp
@@ -155,14 +155,16 @@ public:
             DstIterT const dstBeg, DstIterT const dstEnd,
             PatchCoderT & patchCoder)
   {
-    if (srcEnd - srcBeg < m_BlockSize || dstEnd - dstBeg < m_BlockSize)
+    if (srcEnd - srcBeg < static_cast<decltype(srcEnd - srcBeg)>(m_BlockSize) ||
+        dstEnd - dstBeg < static_cast<decltype(dstEnd - dstBeg)>(m_BlockSize))
     {
       m_FineGrainedDiff.Diff(srcBeg, srcEnd, dstBeg, dstEnd, patchCoder);
       return;
     }
     HasherT hasher;
     HashPosMultiMapT srcHashes;
-    for (SrcIterT src = srcBeg; srcEnd - src >= m_BlockSize; src += m_BlockSize)
+    for (SrcIterT src = srcBeg; srcEnd - src >= static_cast<decltype(srcEnd - src)>(m_BlockSize);
+         src += m_BlockSize)
       srcHashes.insert(HashPosMultiMapValue(hasher.Init(src, m_BlockSize), src - srcBeg));
     SrcIterT srcLastDiff = srcBeg;
     DstIterT dst = dstBeg, dstNext = dstBeg + m_BlockSize, dstLastDiff = dstBeg;
@@ -187,7 +189,7 @@ public:
           patchCoder.Copy(m_BlockSize);
           srcLastDiff = srcBeg + srcBlockEqualPos + m_BlockSize;
           dst = dstLastDiff = dstNext;
-          if (dstEnd - dstNext < m_BlockSize)
+          if (dstEnd - dstNext < static_cast<decltype(dstEnd - dstNext)>(m_BlockSize))
             break;
           dstNext = dst + m_BlockSize;
           h = hasher.Init(dst, m_BlockSize);
diff --git a/coding/point_to_integer.cpp b/coding/point_to_integer.cpp
index b477b8d3ec..39d9cb583c 100644
--- a/coding/point_to_integer.cpp
+++ b/coding/point_to_integer.cpp
@@ -7,8 +7,9 @@ int64_t PointToInt64Obsolete(double x, double y, uint32_t coordBits)
 {
   int64_t const res = static_cast<int64_t>(PointUToUint64Obsolete(PointDToPointU(x, y, coordBits)));
 
-  ASSERT_LESS_OR_EQUAL(res, 3ULL << 2 * POINT_COORD_BITS, ());
   ASSERT_GREATER_OR_EQUAL(res, 0, ("Highest bits of (ix, iy) are not used, so res should be > 0."));
+  ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(res),
+                       static_cast<uint64_t>(3ULL << 2 * POINT_COORD_BITS), ());
   return res;
 }
 
@@ -19,7 +20,9 @@ int64_t PointToInt64Obsolete(m2::PointD const & pt, uint32_t coordBits)
 
 m2::PointD Int64ToPointObsolete(int64_t v, uint32_t coordBits)
 {
-  ASSERT_LESS_OR_EQUAL(v, 3ULL << 2 * POINT_COORD_BITS, ());
+  ASSERT_GREATER_OR_EQUAL(v, 0, ("Highest bits of (ix, iy) are not used, so res should be > 0."));
+  ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(v),
+                       static_cast<uint64_t>(3ULL << 2 * POINT_COORD_BITS), ());
   return PointUToPointD(Uint64ToPointUObsolete(static_cast<uint64_t>(v)), coordBits);
 }
 
diff --git a/drape/drape_tests/buffer_tests.cpp b/drape/drape_tests/buffer_tests.cpp
index 1cc91da836..d68bd36076 100644
--- a/drape/drape_tests/buffer_tests.cpp
+++ b/drape/drape_tests/buffer_tests.cpp
@@ -68,12 +68,12 @@ UNIT_TEST(ParticalUploadDataTest)
 {
   size_t const kPart1Size = 3 * 30;
   float part1Data[kPart1Size];
-  for (int i = 0; i < kPart1Size; ++i)
+  for (size_t i = 0; i < kPart1Size; ++i)
     part1Data[i] = (float)i;
 
   size_t const kPart2Size = 3 * 100;
   float part2Data[kPart2Size];
-  for (int i = 0; i < kPart2Size; ++i)
+  for (size_t i = 0; i < kPart2Size; ++i)
     part2Data[i] = (float)i;
 
   unique_ptr<DataBuffer> buffer(new DataBuffer(3 * sizeof(float), 100));
diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp
index e36a4cb07c..6deb0f1593 100644
--- a/drape/overlay_tree.cpp
+++ b/drape/overlay_tree.cpp
@@ -104,7 +104,7 @@ bool OverlayTree::Frame()
   }
 
   m_frameCounter++;
-  if (m_frameCounter >= m_frameUpdatePeriod)
+  if (m_frameCounter >= static_cast<int>(m_frameUpdatePeriod))
     m_frameCounter = kInvalidFrame;
 
   return IsNeedUpdate();
diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp
index 9b12207baa..92252f8c5d 100644
--- a/drape_frontend/user_event_stream.cpp
+++ b/drape_frontend/user_event_stream.cpp
@@ -1018,8 +1018,9 @@ bool UserEventStream::EndDrag(Touch const & t, bool cancelled)
 
   CheckAutoRotate();
 
-  if (!cancelled && m_kineticScrollEnabled && m_scroller.IsActive() &&
-      m_kineticTimer.TimeElapsedAs<std::chrono::milliseconds>().count() >= kKineticDelayMs)
+  auto const ms = static_cast<uint64_t>(
+              m_kineticTimer.TimeElapsedAs<std::chrono::milliseconds>().count());
+  if (!cancelled && m_kineticScrollEnabled && m_scroller.IsActive() && ms >= kKineticDelayMs)
   {
     drape_ptr<Animation> anim = m_scroller.CreateKineticAnimation(m_navigator.Screen());
     if (anim != nullptr)
@@ -1108,7 +1109,8 @@ void UserEventStream::DetectShortTap(Touch const & touch)
   if (DetectForceTap(touch))
     return;
 
-  auto const ms = m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count();
+  auto const ms = static_cast<uint64_t>(
+              m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count());
   if (ms > kDoubleTapPauseMs)
   {
     m_state = STATE_EMPTY;
@@ -1124,7 +1126,8 @@ void UserEventStream::DetectLongTap(Touch const & touch)
   if (DetectForceTap(touch))
     return;
 
-  auto const ms = m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count();
+  auto const ms = static_cast<uint64_t>(
+              m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count());
   if (ms > kLongTouchMs)
   {
     TEST_CALL(LONG_TAP_DETECTED);
@@ -1136,7 +1139,8 @@ void UserEventStream::DetectLongTap(Touch const & touch)
 
 bool UserEventStream::DetectDoubleTap(Touch const & touch)
 {
-  auto const ms = m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count();
+  auto const ms = static_cast<uint64_t>(
+              m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count());
   if (m_state != STATE_WAIT_DOUBLE_TAP || ms > kDoubleTapPauseMs)
     return false;
 
diff --git a/generator/feature_segments_checker/feature_segments_checker.cpp b/generator/feature_segments_checker/feature_segments_checker.cpp
index 6e17b3c013..43d16ba9db 100644
--- a/generator/feature_segments_checker/feature_segments_checker.cpp
+++ b/generator/feature_segments_checker/feature_segments_checker.cpp
@@ -95,7 +95,7 @@ bool LinearLeastSquaresFactors(vector<double> const & xs, vector<double> const &
   double constexpr kEpsilon = 1e-6;
   size_t const n = xs.size();
   double mx = 0, my = 0, mxy = 0, mx2 = 0;
-  for (int i = 0; i < n; ++i)
+  for (size_t i = 0; i < n; ++i)
   {
     mx += xs[i] / n;
     my += ys[i] / n;
@@ -271,7 +271,7 @@ public:
       return;
 
     double const k = (endAltitude - startAltitude) / realFeatureLengthMeters;
-    for (TAltitude i = 1; i + 1 < numPoints; ++i)
+    for (uint32_t i = 1; i + 1 < numPoints; ++i)
     {
       int32_t const deviation =
           static_cast<TAltitude>(GetY(k, startAltitude, pointDists[i])) - pointAltitudes[i];
diff --git a/generator/generator_tests/tesselator_test.cpp b/generator/generator_tests/tesselator_test.cpp
index a6b04ae9c0..a4719fd6e7 100644
--- a/generator/generator_tests/tesselator_test.cpp
+++ b/generator/generator_tests/tesselator_test.cpp
@@ -32,7 +32,7 @@ namespace
 
     size_t count;
     info.ForEachTriangle(DoDump(count));
-    TEST_EQUAL(count, trianglesCount, ());
+    TEST_EQUAL(count, static_cast<size_t>(trianglesCount), ());
     return count;
   }
 
diff --git a/generator/ugc_db.cpp b/generator/ugc_db.cpp
index d7a7fec5b1..0b998cf825 100644
--- a/generator/ugc_db.cpp
+++ b/generator/ugc_db.cpp
@@ -21,7 +21,7 @@ namespace generator
 static int callback(void * results_ptr, int argc, char ** argv, char ** azColName)
 {
   Results & results = *reinterpret_cast<Results *>(results_ptr);
-  for (size_t i = 0; i < argc; i++)
+  for (int i = 0; i < argc; i++)
   {
     if (results.empty)
       results.empty = false;
diff --git a/geometry/cellid.hpp b/geometry/cellid.hpp
index a6a16e97a0..2af9231d7c 100644
--- a/geometry/cellid.hpp
+++ b/geometry/cellid.hpp
@@ -250,7 +250,7 @@ public:
   {
     ASSERT_GREATER(v, 0, ());
     ASSERT(0 < depth && depth <= DEPTH_LEVELS, (v, depth));
-    ASSERT_LESS_OR_EQUAL(v, TreeSizeForDepth(depth), ());
+    ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(v), TreeSizeForDepth(depth), ());
     uint64_t bits = 0;
     int level = 0;
     --v;
@@ -258,7 +258,7 @@ public:
     {
       bits <<= 2;
       ++level;
-      uint64_t subtreeSize = TreeSizeForDepth(depth - level);
+      int64_t subtreeSize = static_cast<int64_t>(TreeSizeForDepth(depth - level));
       for (--v; v >= subtreeSize; v -= subtreeSize)
         ++bits;
     }
diff --git a/indexer/cell_coverer.hpp b/indexer/cell_coverer.hpp
index 3a433572ec..4b02983985 100644
--- a/indexer/cell_coverer.hpp
+++ b/indexer/cell_coverer.hpp
@@ -169,8 +169,9 @@ void CoverSpiral(m2::RectD rect, int maxDepth, vector<CellId> & result)
   };
 
   auto const coordsAreValid = [](pair<int32_t, int32_t> const & xy) {
-    return xy.first >= 0 && xy.second >= 0 && xy.first <= CellId::MAX_COORD &&
-           xy.second <= CellId::MAX_COORD;
+    return xy.first >= 0 && xy.second >= 0 &&
+           static_cast<decltype(CellId::MAX_COORD)>(xy.first) <= CellId::MAX_COORD &&
+           static_cast<decltype(CellId::MAX_COORD)>(xy.second) <= CellId::MAX_COORD;
   };
 
   m2::RectD coveredRect;
diff --git a/indexer/interval_index_builder.hpp b/indexer/interval_index_builder.hpp
index 86fa29d511..fc6a111573 100644
--- a/indexer/interval_index_builder.hpp
+++ b/indexer/interval_index_builder.hpp
@@ -10,6 +10,7 @@
 #include "base/logging.hpp"
 #include "std/vector.hpp"
 
+#include <limits>
 // +------------------------------+
 // |            Header            |
 // +------------------------------+
@@ -140,8 +141,7 @@ public:
     for (CellIdValueIter it = beg; it != end; ++it)
     {
       CHECK_LESS(it->GetCell(), 1ULL << keyBits, ());
-      // We use static_cast<int64_t>(value) in BuildLeaves to store values difference as VarInt.
-      CHECK_EQUAL(it->GetValue(), static_cast<int64_t>(it->GetValue()), ());
+      CHECK_LESS_OR_EQUAL(it->GetValue(), std::numeric_limits<int64_t>::max(), ());
     }
 
     return true;
diff --git a/map/gps_track_storage.cpp b/map/gps_track_storage.cpp
index 115bb4370b..a2a74041dc 100644
--- a/map/gps_track_storage.cpp
+++ b/map/gps_track_storage.cpp
@@ -171,7 +171,8 @@ void GpsTrackStorage::Append(vector<TItem> const & items)
     TruncFile();
 
   // Write position must be after last item position
-  ASSERT_EQUAL(m_stream.tellp(), GetItemOffset(m_itemCount), ());
+  ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(
+                   GetItemOffset(m_itemCount)), ());
 
   vector<char> buff(min(kItemBlockSize, items.size()) * kPointSize);
   for (size_t i = 0; i < items.size();)
@@ -212,7 +213,8 @@ void GpsTrackStorage::Clear()
     MYTHROW(WriteException, ("File:", m_filePath));
 
   // Write position is set to the first item in the file
-  ASSERT_EQUAL(m_stream.tellp(), GetItemOffset(0), ());
+  ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(
+                   GetItemOffset(0)), ());
 }
 
 void GpsTrackStorage::ForEach(std::function<bool(TItem const & item)> const & fn)
@@ -308,7 +310,8 @@ void GpsTrackStorage::TruncFile()
   m_itemCount = newItemCount;
 
   // Write position must be after last item position (end of file)
-  ASSERT_EQUAL(m_stream.tellp(), GetItemOffset(m_itemCount), ());
+  ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(
+                   GetItemOffset(m_itemCount)), ());
 }
 
 size_t GpsTrackStorage::GetFirstItemIndex() const
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp b/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
index 966c22a8e0..abcf4fb241 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
@@ -241,7 +241,7 @@ void TrafficMode::OnItemSelected(QItemSelection const & selected, QItemSelection
 
   auto const row = selected.front().top();
 
-  CHECK_LESS(row, m_segments.size(), ());
+  CHECK_LESS(row, static_cast<decltype(row)>(m_segments.size()), ());
   m_currentSegment = &m_segments[row];
 
   auto const & partnerSegment = m_currentSegment->GetPartnerSegment();
diff --git a/platform/http_request.cpp b/platform/http_request.cpp
index 20f6d7037d..50c54e8d92 100644
--- a/platform/http_request.cpp
+++ b/platform/http_request.cpp
@@ -290,7 +290,8 @@ public:
     {
       // Check that resume information is correct with existing file.
       uint64_t size;
-      if (my::GetFileSize(filePath + DOWNLOADING_FILE_EXTENSION, size) && size <= fileSize)
+      if (my::GetFileSize(filePath + DOWNLOADING_FILE_EXTENSION, size) &&
+              size <= static_cast<uint64_t>(fileSize))
         openMode = FileWriter::OP_WRITE_EXISTING;
       else
         m_strategy.InitChunks(fileSize, chunkSize);
diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp
index ba9ce9c40c..83ccc1073c 100644
--- a/routing/bicycle_directions.cpp
+++ b/routing/bicycle_directions.cpp
@@ -345,7 +345,8 @@ void BicycleDirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
       continue;
     }
 
-    CHECK_EQUAL(prevJunctions.size(), abs(static_cast<int32_t>(inSegId - startSegId)) + 1, ());
+    CHECK_EQUAL(prevJunctions.size(), static_cast<typename vector<Junction>::size_type>(
+                    abs(static_cast<int32_t>(inSegId - startSegId)) + 1), ());
 
     prevJunctions.push_back(currJunction);
 
diff --git a/routing/index_router.cpp b/routing/index_router.cpp
index 1f0aa06d65..dfb30a7cc6 100644
--- a/routing/index_router.cpp
+++ b/routing/index_router.cpp
@@ -763,7 +763,7 @@ RouterResultCode IndexRouter::ProcessLeaps(vector<Segment> const & input,
                                          [lastMwmId](Segment const & s) { return s.GetMwmId() == lastMwmId; });
   auto const finishLeapStart = distance(input.begin(), finishLeapStartIt);
 
-  for (size_t i = 0; i <= finishLeapStart; ++i)
+  for (vector<Segment>::difference_type i = 0; i <= finishLeapStart; ++i)
   {
     auto const & current = input[i];
 
@@ -780,7 +780,7 @@ RouterResultCode IndexRouter::ProcessLeaps(vector<Segment> const & input,
     {
       bool const isStartLeap = i == 0;
       i = isStartLeap ? startLeapEnd : input.size() - 1;
-      CHECK_LESS(i, input.size(), ());
+      CHECK_LESS(static_cast<vector<Segment>::size_type>(i), input.size(), ());
       auto const & next = input[i];
 
       // First start-to-mwm-exit and last mwm-enter-to-finish leaps need special processing.
@@ -807,7 +807,7 @@ RouterResultCode IndexRouter::ProcessLeaps(vector<Segment> const & input,
     else
     {
       ++i;
-      CHECK_LESS(i, input.size(), ());
+      CHECK_LESS(static_cast<vector<Segment>::size_type>(i), input.size(), ());
       auto const & next = input[i];
 
       CHECK(!IndexGraphStarter::IsFakeSegment(current), ());
diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp
index 68d20980f0..422ed0a3e3 100644
--- a/search/keyword_matcher.cpp
+++ b/search/keyword_matcher.cpp
@@ -57,9 +57,9 @@ KeywordMatcher::Score KeywordMatcher::CalcScore(strings::UniString const * token
   int8_t prevTokenMatchDistance = 0;
   bool prefixMatched = true;
 
-  for (int i = 0; i < m_keywords.size(); ++i)
+  for (decltype(m_keywords)::size_type i = 0; i < m_keywords.size(); ++i)
   {
-    for (int j = 0; j < count && !isQueryTokenMatched[i]; ++j)
+    for (size_t j = 0; j < count && !isQueryTokenMatched[i]; ++j)
     {
       if (!isNameTokenMatched[j] && m_keywords[i] == tokens[j])
       {
@@ -74,7 +74,7 @@ KeywordMatcher::Score KeywordMatcher::CalcScore(strings::UniString const * token
   if (!m_prefix.empty())
   {
     prefixMatched = false;
-    for (int j = 0; j < count && !prefixMatched; ++j)
+    for (size_t j = 0; j < count && !prefixMatched; ++j)
     {
       if (!isNameTokenMatched[j] &&
           strings::StartsWith(tokens[j].begin(), tokens[j].end(), m_prefix.begin(), m_prefix.end()))
diff --git a/search/result.cpp b/search/result.cpp
index a6ee26ddeb..5379c78be2 100644
--- a/search/result.cpp
+++ b/search/result.cpp
@@ -193,7 +193,8 @@ bool Results::AddResult(Result && result)
 
   if (result.IsSuggest())
   {
-    if (distance(m_results.begin(), it) >= kMaxNumSuggests)
+    auto d = distance(m_results.begin(), it);
+    if (d >= static_cast<decltype(d)>(kMaxNumSuggests))
       return false;
 
     for (auto i = m_results.begin(); i != it; ++i)
diff --git a/search/search_quality/assessment_tool/main_model.cpp b/search/search_quality/assessment_tool/main_model.cpp
index a749b1a708..9d6ae575ad 100644
--- a/search/search_quality/assessment_tool/main_model.cpp
+++ b/search/search_quality/assessment_tool/main_model.cpp
@@ -115,7 +115,7 @@ void MainModel::OnSampleSelected(int index)
   CHECK(m_threadChecker.CalledOnOriginalThread(), ());
 
   CHECK_GREATER_OR_EQUAL(index, 0, ());
-  CHECK_LESS(index, m_contexts.Size(), ());
+  CHECK_LESS(static_cast<size_t>(index), m_contexts.Size(), ());
   CHECK(m_view, ());
 
   m_selectedSample = index;
@@ -176,31 +176,33 @@ void MainModel::OnSampleSelected(int index)
 void MainModel::OnResultSelected(int index)
 {
   CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
-  CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
+  CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
   auto const & context = m_contexts[m_selectedSample];
   auto const & foundResults = context.m_foundResults;
 
   CHECK_GREATER_OR_EQUAL(index, 0, ());
-  CHECK_LESS(index, foundResults.GetCount(), ());
+  CHECK_LESS(static_cast<size_t>(index), foundResults.GetCount(), ());
   m_view->MoveViewportToResult(foundResults[index]);
 }
 
 void MainModel::OnNonFoundResultSelected(int index)
 {
   CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
-  CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
+  CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
   auto const & context = m_contexts[m_selectedSample];
   auto const & results = context.m_nonFoundResults;
 
   CHECK_GREATER_OR_EQUAL(index, 0, ());
-  CHECK_LESS(index, results.size(), ());
+  CHECK_LESS(static_cast<decltype(context.m_nonFoundResults)::size_type>(index),
+             results.size(), ());
   m_view->MoveViewportToResult(results[index]);
 }
 
 void MainModel::OnShowViewportClicked()
 {
   CHECK(m_selectedSample != kInvalidIndex, ());
-  CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
+  CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
+  CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
 
   auto const & context = m_contexts[m_selectedSample];
   m_view->MoveViewportToRect(context.m_sample.m_viewport);
@@ -209,7 +211,8 @@ void MainModel::OnShowViewportClicked()
 void MainModel::OnShowPositionClicked()
 {
   CHECK(m_selectedSample != kInvalidIndex, ());
-  CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
+  CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
+  CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
 
   static int constexpr kViewportAroundTopResultsSizeM = 100;
   static double constexpr kViewportAroundTopResultsScale = 1.2;
@@ -258,7 +261,8 @@ bool MainModel::HasChanges() { return m_contexts.HasChanges(); }
 bool MainModel::AlreadyInSamples(FeatureID const & id)
 {
   CHECK(m_selectedSample != kInvalidIndex, ());
-  CHECK(m_selectedSample < m_contexts.Size(), ());
+  CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
+  CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
 
   bool found = false;
   ForAnyMatchingEntry(m_contexts[m_selectedSample], id, [&](Edits & edits, size_t index) {
@@ -272,7 +276,8 @@ bool MainModel::AlreadyInSamples(FeatureID const & id)
 void MainModel::AddNonFoundResult(FeatureID const & id)
 {
   CHECK(m_selectedSample != kInvalidIndex, ());
-  CHECK(m_selectedSample < m_contexts.Size(), ());
+  CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
+  CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
 
   auto & context = m_contexts[m_selectedSample];
 
@@ -296,7 +301,9 @@ void MainModel::OnUpdate(View::ResultType type, size_t sampleIndex, Edits::Updat
 {
   using Type = Edits::Update::Type;
 
-  CHECK_LESS(sampleIndex, m_contexts.Size(), ());
+  CHECK_GREATER_OR_EQUAL(sampleIndex, 0, ());
+  CHECK_LESS(static_cast<size_t>(sampleIndex), m_contexts.Size(), ());
+
   auto & context = m_contexts[sampleIndex];
 
   if (update.m_type == Type::Add)
@@ -395,7 +402,7 @@ void MainModel::ShowMarks(Context const & context)
 void MainModel::OnChangeAllRelevancesClicked(Edits::Relevance relevance)
 {
   CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
-  CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
+  CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
   auto & context = m_contexts[m_selectedSample];
 
   context.m_foundResultsEdits.SetAllRelevances(relevance);
diff --git a/search/search_tests/keyword_matcher_test.cpp b/search/search_tests/keyword_matcher_test.cpp
index 69f483c4a2..1203fc4770 100644
--- a/search/search_tests/keyword_matcher_test.cpp
+++ b/search/search_tests/keyword_matcher_test.cpp
@@ -260,7 +260,8 @@ string GetManyTokens(string tokenPrefix, int tokenCount, bool countForward = tru
 UNIT_TEST(KeywordMatcher_QueryTooLong)
 {
   static_assert(kMaxNumTokens >= 2, "");
-  for (int queryLength = kMaxNumTokens - 2; queryLength <= kMaxNumTokens + 2; ++queryLength)
+  for (int queryLength = kMaxNumTokens - 2;
+       queryLength <= static_cast<int>(kMaxNumTokens + 2); ++queryLength)
   {
     string const query = GetManyTokens("Q", queryLength);
     string const queryWithPrefix = query + " Prefix";
diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/storage/storage_integration_tests/storage_http_tests.cpp
index cc4b727320..ad6ab5b9d7 100644
--- a/storage/storage_integration_tests/storage_http_tests.cpp
+++ b/storage/storage_integration_tests/storage_http_tests.cpp
@@ -102,8 +102,10 @@ UNIT_CLASS_TEST(StorageHttpTest, StorageDownloadNodeAndDeleteNode)
     NodeAttrs nodeAttrs;
     m_storage.GetNodeAttrs(countryId, nodeAttrs);
 
-    TEST_EQUAL(mapSize.first, nodeAttrs.m_downloadingProgress.first, (countryId));
-    TEST_EQUAL(mapSize.second, nodeAttrs.m_downloadingProgress.second, (countryId));
+    TEST_EQUAL(static_cast<decltype(nodeAttrs.m_downloadingProgress.first)>(mapSize.first),
+               nodeAttrs.m_downloadingProgress.first, (countryId));
+    TEST_EQUAL(static_cast<decltype(nodeAttrs.m_downloadingProgress.second)>(mapSize.second),
+               nodeAttrs.m_downloadingProgress.second, (countryId));
     TEST_EQUAL(countryId, kCountryId, (countryId));
   };
 
@@ -142,8 +144,10 @@ UNIT_CLASS_TEST(StorageHttpTest, StorageDownloadAndDeleteDisputedNode)
     NodeAttrs nodeAttrs;
     m_storage.GetNodeAttrs(countryId, nodeAttrs);
 
-    TEST_EQUAL(mapSize.first, nodeAttrs.m_downloadingProgress.first, (countryId));
-    TEST_EQUAL(mapSize.second, nodeAttrs.m_downloadingProgress.second, (countryId));
+    TEST_EQUAL(static_cast<decltype(nodeAttrs.m_downloadingProgress.first)>(mapSize.first),
+               nodeAttrs.m_downloadingProgress.first, (countryId));
+    TEST_EQUAL(static_cast<decltype(nodeAttrs.m_downloadingProgress.second)>(mapSize.second),
+               nodeAttrs.m_downloadingProgress.second, (countryId));
   };
 
   InitStorage(m_storage, UpdateWithoutChecks, progressFunction);
diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp
index fba4184f13..8967c6d428 100644
--- a/storage/storage_tests/storage_tests.cpp
+++ b/storage/storage_tests/storage_tests.cpp
@@ -337,12 +337,14 @@ protected:
 
     LOG(LINFO, (m_countryFile, "downloading progress:", progress));
 
-    TEST_GREATER(progress.first, m_bytesDownloaded, (m_countryFile));
+    TEST_GREATER(progress.first, static_cast<
+                 decltype(progress.first)>(m_bytesDownloaded), (m_countryFile));
     m_bytesDownloaded = progress.first;
     TEST_LESS_OR_EQUAL(m_bytesDownloaded, m_totalBytesToDownload, (m_countryFile));
 
     TLocalAndRemoteSize localAndRemoteSize = m_storage.CountrySizeInBytes(m_countryId, m_files);
-    TEST_EQUAL(m_totalBytesToDownload, localAndRemoteSize.second, (m_countryFile));
+    TEST_EQUAL(static_cast<decltype(localAndRemoteSize.second)>(m_totalBytesToDownload),
+               localAndRemoteSize.second, (m_countryFile));
   }
 
   Storage & m_storage;
@@ -1435,12 +1437,12 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm)
   storage.GetUpdateInfo("OutdatedCountry1", updateInfo);
   TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 1, ());
   TEST_EQUAL(updateInfo.m_totalUpdateSizeInBytes, 50, ());
-  TEST_EQUAL(updateInfo.m_sizeDifference, 50 - country1Size, ());
+  TEST_EQUAL(updateInfo.m_sizeDifference, static_cast<int64_t>(50 - country1Size), ());
 
   storage.GetUpdateInfo("OutdatedCountry2", updateInfo);
   TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 1, ());
   TEST_EQUAL(updateInfo.m_totalUpdateSizeInBytes, 1000, ());
-  TEST_EQUAL(updateInfo.m_sizeDifference, 1000 - country2Size, ());
+  TEST_EQUAL(updateInfo.m_sizeDifference, static_cast<int64_t>(1000 - country2Size), ());
 
   storage.GetUpdateInfo("Abkhazia", updateInfo);
   TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 0, ());
@@ -1457,7 +1459,8 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm)
   storage.GetUpdateInfo(storage.GetRootId(), updateInfo);
   TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 2, ());
   TEST_EQUAL(updateInfo.m_totalUpdateSizeInBytes, 1050, ());
-  TEST_EQUAL(updateInfo.m_sizeDifference, (1000 + 50) - (country1Size + country2Size), ());
+  TEST_EQUAL(updateInfo.m_sizeDifference,
+             static_cast<int64_t>((1000 + 50) - (country1Size + country2Size)), ());
 }
 #endif  // defined(OMIM_OS_DESKTOP)