diff --git a/base/lower_case.cpp b/base/lower_case.cpp
index 1c48ce63bc..df882c24ea 100644
--- a/base/lower_case.cpp
+++ b/base/lower_case.cpp
@@ -57,7 +57,7 @@ UniChar LowerUniChar(UniChar c)
   }
 }
 
-static int w(UniChar c, UniChar * buf)
+static size_t w(UniChar c, UniChar * buf)
 {
   switch (c)
   {
@@ -182,7 +182,7 @@ void MakeLowerCase(UniString & s)
     else
     { // special case, replace this char with two or more chars for full case folding
       UniChar cc[3];
-      int const count = w(s[i], &cc[0]);
+      size_t const count = w(s[i], &cc[0]);
       for (size_t j = 0; j < count; ++j)
         r.push_back(cc[j]);
     }
diff --git a/base/normalize_unicode.cpp b/base/normalize_unicode.cpp
index 825c06bd21..e067eb152c 100644
--- a/base/normalize_unicode.cpp
+++ b/base/normalize_unicode.cpp
@@ -14,7 +14,7 @@ static void w(strings::UniString & r, uint16_t startIndex, int count)
 void Normalize(strings::UniString & s)
 {
   strings::UniString r;
-  for (int i = 0; i < s.size(); ++i)
+  for (size_t i = 0; i < s.size(); ++i)
   {
     strings::UniChar const c = s[i];
     // ASCII optimization
diff --git a/coding/coding_tests/varint_test.cpp b/coding/coding_tests/varint_test.cpp
index 5271b6050b..8c15073049 100644
--- a/coding/coding_tests/varint_test.cpp
+++ b/coding/coding_tests/varint_test.cpp
@@ -129,7 +129,7 @@ UNIT_TEST(ReadVarInt64Array)
   }
 
   // Test all subsets.
-  for (size_t i = 1; i < 1 << values.size(); ++i)
+  for (size_t i = 1; i < 1U << values.size(); ++i)
   {
     vector<int64_t> testValues;
     for (size_t j = 0; j < values.size(); ++j)
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index 13b10174e4..25a63079c0 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -221,7 +221,7 @@ public:
   {
   public:
     uint32_t m_types[m_maxTypesCount];
-    int m_size;
+    size_t m_size;
 
     GetTypesFn() : m_size(0) {}
     void operator() (uint32_t t)
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index d26cad25e4..fe6c0a71f6 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -141,7 +141,7 @@ int GetDrawRule(FeatureBase const & f, int level, vector<drule::Key> & keys, str
   Classificator const & c = classif();
 
   DrawRuleGetter doRules(level, geoType, keys, names);
-  for (int i = 0; i < types.m_size; ++i)
+  for (size_t i = 0; i < types.m_size; ++i)
     (void)c.ProcessObjects(types.m_types[i], doRules);
 
   return geoType;
@@ -253,7 +253,7 @@ bool IsDrawableForIndex(FeatureBase const & f, int level)
   Classificator const & c = classif();
 
   IsDrawableChecker doCheck(level);
-  for (int i = 0; i < types.m_size; ++i)
+  for (size_t i = 0; i < types.m_size; ++i)
     if (c.ProcessObjects(types.m_types[i], doCheck))
       return true;
 
@@ -283,7 +283,7 @@ int MinDrawableScaleForText(FeatureBase const & f)
   for (int level = 0; level <= upBound; ++level)
   {
     TextRulesChecker doCheck(level, geomType);
-    for (int i = 0; i < types.m_size; ++i)
+    for (size_t i = 0; i < types.m_size; ++i)
       if (c.ProcessObjects(types.m_types[i], doCheck))
         return level;
   }
diff --git a/indexer/interval_index.hpp b/indexer/interval_index.hpp
index b038e05da2..fa62a0700d 100644
--- a/indexer/interval_index.hpp
+++ b/indexer/interval_index.hpp
@@ -125,7 +125,7 @@ private:
     uint64_t const levelBytesFF = (1ULL << skipBits) - 1;
     uint32_t const beg0 = static_cast<uint32_t>(beg >> skipBits);
     uint32_t const end0 = static_cast<uint32_t>(end >> skipBits);
-    ASSERT_LESS(end0, (1 << m_Header.m_BitsPerLevel), (beg, end, skipBits));
+    ASSERT_LESS(end0, (1U << m_Header.m_BitsPerLevel), (beg, end, skipBits));
 
     buffer_vector<uint8_t, 576> data(size);
     m_Reader.Read(offset, &data[0], size);
diff --git a/map/map_tests/map_foreach_test.cpp b/map/map_tests/map_foreach_test.cpp
index 3b6c616623..d4b13949fb 100644
--- a/map/map_tests/map_foreach_test.cpp
+++ b/map/map_tests/map_foreach_test.cpp
@@ -221,7 +221,7 @@ namespace
 
         FeatureType::GetTypesFn getTypes;
         f.ForEachTypeRef(getTypes);
-        for (int i = 0; i < getTypes.m_size; ++i)
+        for (size_t i = 0; i < getTypes.m_size; ++i)
           cout << classif().GetFullObjectName(getTypes.m_types[i]) << endl;
       }
     }
diff --git a/yg/glyph_cache_impl.cpp b/yg/glyph_cache_impl.cpp
index 846dba9190..1c0f8d9d29 100644
--- a/yg/glyph_cache_impl.cpp
+++ b/yg/glyph_cache_impl.cpp
@@ -176,7 +176,7 @@ namespace yg
 
     /// modifying the m_unicodeBlocks
 
-    int lastUBEnd = 0;
+    uint32_t lastUBEnd = 0;
 
     unicode_blocks_t::iterator ubIt = m_unicodeBlocks.begin();
     vector<FT_ULong>::iterator ccIt = charcodes.begin();