diff --git a/coding/dd_vector.hpp b/coding/dd_vector.hpp
index f31452d6d9..255822a984 100644
--- a/coding/dd_vector.hpp
+++ b/coding/dd_vector.hpp
@@ -166,10 +166,11 @@ public:
 private:
   void InitSize()
   {
-    if ((m_reader.Size() % sizeof(T)) != 0)
-      MYTHROW(OpenException, (m_reader.Size(), sizeof(T)));
-    // TODO: Check that reader.Size() % sizeof(T) == 0
-    m_Size = m_reader.Size() / sizeof(T);
+    uint64_t const sz = m_reader.Size();
+    if ((sz % sizeof(T)) != 0)
+      MYTHROW(OpenException, (sz, sizeof(T)));
+
+    m_Size = sz / sizeof(T);
   }
 
   // TODO: Refactor me to use Reader by pointer.
diff --git a/indexer/scale_index_builder.hpp b/indexer/scale_index_builder.hpp
index ef0911956c..b92d92938b 100644
--- a/indexer/scale_index_builder.hpp
+++ b/indexer/scale_index_builder.hpp
@@ -148,7 +148,7 @@ inline void IndexScales(uint32_t bucketsCount,
     {
       FileReader reader(tmpFilePrefix + ".c2f.sorted");
       uint64_t const numCells = reader.Size() / sizeof(CellFeaturePair);
-      DDVector<CellFeaturePair, FileReader, uint64_t> cellsToFeatures(reader, numCells);
+      DDVector<CellFeaturePair, FileReader, uint64_t> cellsToFeatures(reader);
       LOG(LINFO, ("Being indexed", "features:", numFeatures, "cells:", numCells,
                   "cells per feature:", (numCells + 1.0) / (numFeatures + 1.0)));
       SubWriter<WriterT> subWriter(writer);
diff --git a/platform/preferred_languages.hpp b/platform/preferred_languages.hpp
index a492fefbe9..0feace7efc 100644
--- a/platform/preferred_languages.hpp
+++ b/platform/preferred_languages.hpp
@@ -5,9 +5,12 @@
 namespace languages
 {
 
+/// @note This functions are heavy enough to call them often. Be careful.
+//@{
 /// @return system language preferences in the form "en|ru|es|zh"
 string PreferredLanguages();
 /// @return language code for current user in the form "en"
 string CurrentLanguage();
+//@}
 
 }