diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform
index efc8d7221..99a212b1b 100755
--- a/build_tools/build_detect_platform
+++ b/build_tools/build_detect_platform
@@ -156,7 +156,9 @@ case "$TARGET_OS" in
         exit 1
 esac
 
-$PWD/build_tools/build_detect_version
+if test -z "$DO_NOT_RUN_BUILD_DETECT_VERSION"; then
+  $PWD/build_tools/build_detect_version
+fi
 
 # We want to make a list of all cc files within util, db, table, and helpers
 # except for the test and benchmark files. By default, find will output a list
diff --git a/db/file_indexer_test.cc b/db/file_indexer_test.cc
index bfec8dd8f..14d67f4e8 100644
--- a/db/file_indexer_test.cc
+++ b/db/file_indexer_test.cc
@@ -87,7 +87,7 @@ struct FileIndexerTest {
 
 TEST(FileIndexerTest, next_level_hint) {
   for (uint32_t i = 0; i < kNumLevels; ++i) {
-    ASSERT_EQ(0, indexer.LevelIndexSize(i));
+    ASSERT_EQ(0U, indexer.LevelIndexSize(i));
   }
 
   // Case 1: no overlap, files are on the left of next level files
@@ -129,7 +129,7 @@ TEST(FileIndexerTest, next_level_hint) {
   // Case 2: no overlap, files are on the right of next level files
   Reset();
   for (uint32_t i = 1; i < kNumLevels; ++i) {
-    ASSERT_EQ(0, indexer.LevelIndexSize(i));
+    ASSERT_EQ(0U, indexer.LevelIndexSize(i));
   }
   // level 1
   AddFile(1, 2100, 2200);
@@ -170,7 +170,7 @@ TEST(FileIndexerTest, next_level_hint) {
   // Case 3: empty L2
   Reset();
   for (uint32_t i = 1; i < kNumLevels; ++i) {
-    ASSERT_EQ(0, indexer.LevelIndexSize(i));
+    ASSERT_EQ(0U, indexer.LevelIndexSize(i));
   }
   // level 1
   AddFile(1, 2100, 2200);
@@ -206,7 +206,7 @@ TEST(FileIndexerTest, next_level_hint) {
   // Case 4: mixed
   Reset();
   for (uint32_t i = 1; i < kNumLevels; ++i) {
-    ASSERT_EQ(0, indexer.LevelIndexSize(i));
+    ASSERT_EQ(0U, indexer.LevelIndexSize(i));
   }
   // level 1
   AddFile(1, 100, 200);
diff --git a/db/plain_table_db_test.cc b/db/plain_table_db_test.cc
index 4cff95952..517ef0a94 100644
--- a/db/plain_table_db_test.cc
+++ b/db/plain_table_db_test.cc
@@ -265,7 +265,7 @@ TEST(PlainTableDBTest, Flush) {
 
       TablePropertiesCollection ptc;
       reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc);
-      ASSERT_EQ(1, ptc.size());
+      ASSERT_EQ(1U, ptc.size());
       auto row = ptc.begin();
       auto tp = row->second;
       ASSERT_EQ(
diff --git a/util/hash_cuckoo_rep.h b/util/hash_cuckoo_rep.h
index 55093dfbd..8f97ed4e4 100644
--- a/util/hash_cuckoo_rep.h
+++ b/util/hash_cuckoo_rep.h
@@ -16,7 +16,7 @@ namespace rocksdb {
 class HashCuckooRepFactory : public MemTableRepFactory {
  public:
   // maxinum number of hash functions used in the cuckoo hash.
-  static const int kMaxHashCount = 10;
+  static const unsigned int kMaxHashCount = 10;
 
   explicit HashCuckooRepFactory(size_t write_buffer_size,
                                 size_t average_data_size,