diff --git a/examples/v2/matterbridge/chat2bridge.nim b/examples/v2/matterbridge/chat2bridge.nim
index c4ce040cc..d174ea5b1 100644
--- a/examples/v2/matterbridge/chat2bridge.nim
+++ b/examples/v2/matterbridge/chat2bridge.nim
@@ -10,6 +10,7 @@ import
   ../../../waku/common/utils/matterbridge_client,
   # Waku v2 imports
   libp2p/crypto/crypto,
+  libp2p/errors,
   ../../../waku/v2/node/wakunode2,
   # Chat 2 imports
   ../chat2,
diff --git a/tests/v2/test_peer_exchange.nim b/tests/v2/test_peer_exchange.nim
index 456e4d7fc..a2cecd9d3 100644
--- a/tests/v2/test_peer_exchange.nim
+++ b/tests/v2/test_peer_exchange.nim
@@ -6,6 +6,7 @@ import
   testutils/unittests,
   chronicles,
   chronos,
+  libp2p/peerid,
   libp2p/crypto/crypto,
   libp2p/protocols/pubsub/gossipsub
 import
diff --git a/tests/v2/test_rest_debug_api.nim b/tests/v2/test_rest_debug_api.nim
index de901f37d..3ebba83af 100644
--- a/tests/v2/test_rest_debug_api.nim
+++ b/tests/v2/test_rest_debug_api.nim
@@ -5,6 +5,8 @@ import
   chronicles,
   testutils/unittests,
   presto, 
+  libp2p/peerid,
+  libp2p/multiaddress,
   libp2p/crypto/crypto
 import
   ../../waku/v2/node/wakunode2,
diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index 3925f6664..e21d19c00 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -6,6 +6,8 @@ import
   metrics, metrics/chronos_httpserver,
   stew/byteutils,
   stew/shims/net as stewNet, json_rpc/rpcserver,
+  libp2p/errors,
+  libp2p/peerstore,
   # Waku v1 imports
   eth/[keys, p2p], eth/common/utils,
   eth/p2p/[enode, peer_pool],
diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index c5115a269..c66af4fec 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -31,7 +31,6 @@ import
   ./wakunode2_types
 
 export
-  builders,
   waku_message,
   waku_rln_relay_types,
   wakunode2_types
diff --git a/waku/v2/node/wakunode2_setup_sql_migrations.nim b/waku/v2/node/wakunode2_setup_sql_migrations.nim
index d2ff655ce..c6764f6b2 100644
--- a/waku/v2/node/wakunode2_setup_sql_migrations.nim
+++ b/waku/v2/node/wakunode2_setup_sql_migrations.nim
@@ -1,11 +1,11 @@
 {.push raises: [Defect].}
 
 import
+  stew/results,
   chronicles,
   ./storage/sqlite,
   ./storage/migration/migration_types,
-  ./config,
-  ./wakunode2
+  ./config
 
 logScope:
   topics = "wakunode.setup.migrations"
@@ -23,7 +23,7 @@ proc runMigrations*(sqliteDatabase: SqliteDatabase, conf: WakuNodeConf) =
 
   info "running migration ...", migrationPath=migrationPath
   let migrationResult = sqliteDatabase.migrate(migrationPath)
-  if migrationResult.isErr:
-    warn "migration failed", error=migrationResult.error
+  if migrationResult.isErr():
+    warn "migration failed", error=migrationResult.error()
   else:
     info "migration is done"