diff --git a/db/db_test.cc b/db/db_test.cc
index ddd59e8845..4c06fa9bee 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -2327,13 +2327,16 @@ TEST_F(DBTest, GetProperty) {
   sleeping_task_low.WakeUp();
   sleeping_task_low.WaitUntilDone();
 
-  dbfull()->TEST_WaitForFlushMemTable();
+  // Wait for compaction to be done. This is important because otherwise RocksDB
+  // might schedule a compaction when reopening the database, failing assertion
+  // (A) as a result.
+  dbfull()->TEST_WaitForCompact();
   options.max_open_files = 10;
   Reopen(options);
   // After reopening, no table reader is loaded, so no memory for table readers
   ASSERT_TRUE(
       dbfull()->GetIntProperty("rocksdb.estimate-table-readers-mem", &int_num));
-  ASSERT_EQ(int_num, 0U);
+  ASSERT_EQ(int_num, 0U);  // (A)
   ASSERT_TRUE(dbfull()->GetIntProperty("rocksdb.estimate-num-keys", &int_num));
   ASSERT_GT(int_num, 0U);
 
diff --git a/db/table_cache.cc b/db/table_cache.cc
index 09de6001ca..35250c66ea 100644
--- a/db/table_cache.cc
+++ b/db/table_cache.cc
@@ -123,7 +123,7 @@ Status TableCache::FindTable(const EnvOptions& env_options,
                            const_cast<bool*>(&no_io));
 
   if (*handle == nullptr) {
-    if (no_io) { // Dont do IO and return a not-found status
+    if (no_io) {  // Don't do IO and return a not-found status
       return Status::Incomplete("Table not found in table_cache, no_io is set");
     }
     unique_ptr<TableReader> table_reader;
diff --git a/db/table_cache.h b/db/table_cache.h
index a33d9e7913..60851e5029 100644
--- a/db/table_cache.h
+++ b/db/table_cache.h
@@ -91,7 +91,7 @@ class TableCache {
                             bool no_io = false);
 
   // Return total memory usage of the table reader of the file.
-  // 0 of table reader of the file is not loaded.
+  // 0 if table reader of the file is not loaded.
   size_t GetMemoryUsageByTableReader(
       const EnvOptions& toptions,
       const InternalKeyComparator& internal_comparator,