diff --git a/test/common/common/mem_block_builder_test.cc b/test/common/common/mem_block_builder_test.cc
index 051067b47661a..0fbcdff18be4f 100644
--- a/test/common/common/mem_block_builder_test.cc
+++ b/test/common/common/mem_block_builder_test.cc
@@ -68,28 +68,24 @@ TEST(MemBlockBuilderTest, AppendUint32) {
   EXPECT_EQ(0, mem_block.capacity());
 }
 
-TEST(MemBlockBuilderTest, AppendOneTooMuch) {
-  MemBlockBuilder<uint8_t> mem_block(1);
-  mem_block.appendOne(1);
-  EXPECT_DEATH({ mem_block.appendOne(2); },
 #ifdef ENVOY_CONFIG_COVERAGE
-               "" // For some reason, this test under coverage generates a list of testdata/*.
+// For some reason, this test under coverage generates a list of testdata/*.
+static const char expected_death_regex[] = "";
 #else
-               ".*insufficient capacity.*"
+static const char expected_death_regex[] = ".*insufficient capacity.*";
 #endif
-  );
+
+TEST(MemBlockBuilderTest, AppendOneTooMuch) {
+  MemBlockBuilder<uint8_t> mem_block(1);
+  mem_block.appendOne(1);
+  EXPECT_DEATH({ mem_block.appendOne(2); }, expected_death_regex);
 }
 
 TEST(MemBlockBuilderTest, AppendDataTooMuch) {
   MemBlockBuilder<uint8_t> mem_block(1);
   const uint8_t foo[] = {1, 2};
   EXPECT_DEATH({ mem_block.appendData(absl::MakeConstSpan(foo, ABSL_ARRAYSIZE(foo))); },
-#ifdef ENVOY_CONFIG_COVERAGE
-               "" // For some reason, this test under coverage generates a list of testdata/*.
-#else
-               ".*insufficient capacity.*"
-#endif
-  );
+               expected_death_regex);
 }
 
 } // namespace Envoy
diff --git a/test/common/config/metadata_test.cc b/test/common/config/metadata_test.cc
index b856a45e82b15..548f5078f54a8 100644
--- a/test/common/config/metadata_test.cc
+++ b/test/common/config/metadata_test.cc
@@ -60,7 +60,7 @@ class TypedMetadataTest : public testing::Test {
 
   struct Bar : public TypedMetadata::Object {};
 
-  class FooFactory : public TypedMetadataFactory::TypedMetadataFactory {
+  class FooFactory : public TypedMetadataFactory {
   public:
     const std::string name() const override { return "foo"; }
     // Throws EnvoyException (conversion failure) if d is empty.
diff --git a/tools/clang_tools/api_booster/main.cc b/tools/clang_tools/api_booster/main.cc
index 30df4978302fa..e652e7de7a6e3 100644
--- a/tools/clang_tools/api_booster/main.cc
+++ b/tools/clang_tools/api_booster/main.cc
@@ -1,6 +1,6 @@
 // Upgrade a single Envoy C++ file to the latest API version.
 //
-// Currently this tool is a WiP and only does inference of .pb[.validate].h
+// Currently this tool is a WIP and only does inference of .pb[.validate].h
 // #include locations. This already exercises some of the muscles we need, such
 // as AST matching, rudimentary type inference and API type database lookup.
 //
@@ -129,7 +129,7 @@ class ApiBooster : public clang::ast_matchers::MatchFinder::MatchCallback,
     return true;
   }
 
-  // Visitor callback for end of a compiation unit.
+  // Visitor callback for end of a compilation unit.
   void handleEndSource() override {
     // Dump known API header paths to stdout for api_boost.py to rewrite with
     // (no rewriting support in this tool yet).
@@ -194,7 +194,7 @@ class ApiBooster : public clang::ast_matchers::MatchFinder::MatchCallback,
       // Die hard if we don't have a useful proto type for something that looks
       // like an API type(modulo a short whitelist).
       std::cerr << "Unknown API type: " << proto_type_name << std::endl;
-      // TODO(htuch): mabye there is a nicer way to terminate AST traversal?
+      // TODO(htuch): maybe there is a nicer way to terminate AST traversal?
       ::exit(1);
     }
 
diff --git a/tools/spelling_dictionary.txt b/tools/spelling_dictionary.txt
index ed6c2f16adbe5..1095c2893e647 100644
--- a/tools/spelling_dictionary.txt
+++ b/tools/spelling_dictionary.txt
@@ -48,6 +48,7 @@ CTXs
 CVC
 CVE
 CX
+CYGWIN
 DER
 DESC
 DFATAL
@@ -57,7 +58,9 @@ DNS
 DRYs
 DS
 DST
+DW
 EADDRINUSE
+EADDRNOTAVAIL
 EAGAIN
 ECDH
 ECDHE
@@ -91,6 +94,7 @@ FCDS
 FFFF
 FIN
 FIPS
+FIRSTHDR
 FQDN
 FREEBIND
 FUZZER
@@ -150,6 +154,7 @@ LDS
 LEV
 LF
 LHS
+LLVM
 LRS
 MB
 MD
@@ -165,6 +170,7 @@ NACKs
 NBF
 NBSP
 NDEBUG
+NEXTHDR
 NGHTTP
 NOAUTH
 NODELAY
@@ -299,6 +305,7 @@ VLOG
 VM
 WASM
 WAVM
+WIP
 WKT
 WRR
 WS
@@ -421,7 +428,6 @@ codings
 combinatorial
 comparator
 compat
-compiation
 completable
 cond
 condvar
@@ -572,6 +578,7 @@ goog
 google
 goto
 gzip
+hackery
 hacky
 handshaker
 hardcoded
@@ -648,6 +655,7 @@ lenenc
 lexically
 libc
 libevent
+libtool
 libstdc
 libtooling
 lifecycle
@@ -671,7 +679,6 @@ lowp
 ltrim
 lua
 lyft
-mabye
 maglev
 malloc
 matchable
diff --git a/tools/type_whisperer/api_type_db.h b/tools/type_whisperer/api_type_db.h
index a662ea4e7524b..8647990b6843e 100644
--- a/tools/type_whisperer/api_type_db.h
+++ b/tools/type_whisperer/api_type_db.h
@@ -21,7 +21,7 @@ struct TypeInformation {
 
 // We don't expose the raw API type database to consumers, as this requires RTTI
 // and this may be linked in environments where this is not available (e.g.
-// libtooling binaries).
+// libtool binaries).
 class ApiTypeDb {
 public:
   static absl::optional<TypeInformation> getLatestTypeInformation(const std::string& type_name);