diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0262ae1e..36fec4eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,7 +200,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(GCC 1)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set(CLANG 1)
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
   set(INTEL 1)
 elseif (NOT MSVC)
   message(FATAL_ERROR "Compiler isn't supported")
diff --git a/crypto/vm/boc.h b/crypto/vm/boc.h
index 8adf240f..c61fa66f 100644
--- a/crypto/vm/boc.h
+++ b/crypto/vm/boc.h
@@ -117,7 +117,7 @@ struct CellStorageStat {
   struct CellInfo {
     td::uint32 max_merkle_depth = 0;
   };
-  std::map<vm::Cell::Hash, CellInfo> seen;
+  std::unordered_map<vm::Cell::Hash, CellInfo> seen;
   CellStorageStat() : cells(0), bits(0), public_cells(0) {
   }
   explicit CellStorageStat(unsigned long long limit_cells)