diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index f68997c57b..422bccf6c1 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -470,7 +470,10 @@ void FeatureBase::InitFeatureBuilder(FeatureBuilder1 & fb) const
     fb.SetCenter(m_Center);
 
   if (h & HEADER_IS_AREA)
-    fb.SetAreaAddHoles(list<vector<m2::PointD> >());
+  {
+    list<vector<m2::PointD> > l;
+    fb.SetAreaAddHoles(l);
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -594,7 +597,7 @@ void FeatureType::ReadOffsetsImpl(ArrayByteSource & src, offsets_t & offsets)
   ASSERT ( mask > 0, () );
   while (mask > 0)
   {
-    ASSERT ( index < ARRAY_SIZE(g_arrScales), (index) );
+    ASSERT ( index < ARRAY_SIZE(feature::g_arrScales), (index) );
 
     offsets[index++] = (mask & 0x01) ? ReadVarUint<uint32_t>(src) : m_invalidOffset;
 
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index dd1184d367..0da107213d 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -15,6 +15,7 @@
 #include "../std/vector.hpp"
 #include "../std/array.hpp"
 
+#include <boost/bind.hpp>
 
 class ArrayByteSource;
 class FeatureBase;
@@ -44,7 +45,7 @@ public:
   template <class TIter>
   inline void AddTypes(TIter beg, TIter end)
   {
-    int const count = min(m_maxTypesCount, static_cast<int>(distance(beg, end)));
+    int const count = min(static_cast<int>(m_maxTypesCount), static_cast<int>(distance(beg, end)));
     m_Types.assign(beg, beg + count);
   }
   inline void SetType(uint32_t type)
@@ -79,7 +80,7 @@ public:
   template <class ToDo>
   void ForEachPointRef(ToDo & toDo) const
   {
-    for_each(m_Geometry.begin(), m_Geometry.end(), bind<void>(ref(toDo), _1));
+    for_each(m_Geometry.begin(), m_Geometry.end(), boost::bind<void>(ref(toDo), _1));
   }
   //@}