diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index e3de6990ae..d049626db5 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -336,7 +336,8 @@ namespace
   template <class TSink> class BitSink
   {
     TSink & m_sink;
-    uint8_t m_pos, m_current;
+    uint8_t m_current;
+    uint8_t m_pos;
 
   public:
     BitSink(TSink & sink) : m_sink(sink), m_pos(0), m_current(0) {}
diff --git a/indexer/feature_impl.hpp b/indexer/feature_impl.hpp
index 2f2feb1699..ab0ba3e766 100644
--- a/indexer/feature_impl.hpp
+++ b/indexer/feature_impl.hpp
@@ -128,9 +128,11 @@ namespace feature
   template <class TSink>
   void SaveTriangles(vector<m2::PointD> const & triangles, int64_t base, TSink & sink)
   {
+#ifdef DEBUG
     uint32_t const count = triangles.size();
     ASSERT_GREATER ( count, 0, () );
     ASSERT_EQUAL ( count % 3, 0, (count) );
+#endif
 
     vector<int64_t> cells;
     detail::TransformPoints(triangles, cells);
@@ -143,9 +145,11 @@ namespace feature
   {
     detail::ReadPoints(points, base, src);
 
+#ifdef DEBUG
     uint32_t const count = points.size();
     ASSERT_GREATER ( count, 0, () );
     ASSERT_EQUAL ( count % 3, 0, (count) );
+#endif
   }