diff --git a/config.nims b/config.nims
index 20c5862cb..9136cb711 100644
--- a/config.nims
+++ b/config.nims
@@ -180,9 +180,6 @@ switch("warning", "CaseTransition:off")
 # do its (N)RVO pass: https://github.com/nim-lang/RFCs/issues/230
 switch("warning", "ObservableStores:off")
 
-# Too many false positives for "Warning: method has lock level <unknown>, but another method has 0 [LockLevel]"
-switch("warning", "LockLevel:off")
-
 # nim-kzg shipping their own blst, nimbus-eth1 too.
 # disable nim-kzg's blst
 switch("define", "kzgExternalBlst")
@@ -202,9 +199,6 @@ when not defined(use_system_rocksdb) and not defined(windows):
   switch("dynlibOverride", "lz4")
   switch("dynlibOverride", "zstd")
 
-when defined(gcc):
-  switch("passc", "-Wno-error=incompatible-pointer-types")
-
 # This applies per-file compiler flags to C files
 # which do not support {.localPassC: "...".}
 # Unfortunately this is filename based instead of path-based
diff --git a/tests/test_txpool.nim b/tests/test_txpool.nim
index c6bb58f46..a5680ba16 100644
--- a/tests/test_txpool.nim
+++ b/tests/test_txpool.nim
@@ -9,11 +9,11 @@
 # according to those terms.
 
 import
-  std/[algorithm, os, random, sequtils, strformat, strutils, tables, times],
+  std/[algorithm, random, sequtils, strformat, strutils, tables, times],
   ../nimbus/core/chain, # must be early (compilation annoyance)
   ../nimbus/common/common,
-  ../nimbus/core/[executor, casper, tx_pool, tx_pool/tx_item],
-  ../nimbus/[config, evm/state, evm/types],
+  ../nimbus/core/[casper, tx_pool, tx_pool/tx_item],
+  ../nimbus/config,
   ./test_txpool/[helpers, setup, sign_helper],
   chronos,
   eth/[keys, p2p],
diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl
index a806cbfab..646fa2152 160000
--- a/vendor/nim-bearssl
+++ b/vendor/nim-bearssl
@@ -1 +1 @@
-Subproject commit a806cbfab5fe8de49c76139f8705fff79daf99ee
+Subproject commit 646fa2152b11980c24bf34b3e214b479c9d25f21
diff --git a/vendor/nim-stew b/vendor/nim-stew
index 28743363f..e00fea1f6 160000
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@@ -1 +1 @@
-Subproject commit 28743363fff5d751b9dd1809b0c7ccf332eb8d79
+Subproject commit e00fea1f6e14234adb10d9c117a70905ae31872b
diff --git a/vendor/nim-stint b/vendor/nim-stint
index 9d2b382c5..9a3348bd4 160000
--- a/vendor/nim-stint
+++ b/vendor/nim-stint
@@ -1 +1 @@
-Subproject commit 9d2b382c5dc34f0d6bbd93b2a5d65dde85067e0f
+Subproject commit 9a3348bd4499045fb211afeeaf2a54730060c081