diff --git a/Makefile b/Makefile
index 79c78c005..5fbf81ee9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ BUILD_SYSTEM_DIR := vendor/nimbus-build-system
 -include $(BUILD_SYSTEM_DIR)/makefiles/variables.mk
 
 # debugging tools + testing tools
-TOOLS := premix persist debug dumper hunter regress tracerTestGen persistBlockTestGen process_dashboard
+TOOLS := premix persist debug dumper hunter regress tracerTestGen persistBlockTestGen
 TOOLS_DIRS := premix tests waku
 # comma-separated values for the "clean" target
 TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
diff --git a/nimbus/rpc/waku.nim b/nimbus/rpc/waku.nim
index cad84cda6..6abc1ce19 100644
--- a/nimbus/rpc/waku.nim
+++ b/nimbus/rpc/waku.nim
@@ -53,13 +53,9 @@ proc setupWakuRPC*(node: EthereumNode, keys: WhisperKeys, rpcsrv: RpcServer) =
     ## pow: The new PoW requirement.
     ##
     ## Returns true on success and an error on failure.
-    # Note: If any of the `peer.powRequirement` calls fails, we do not care and
-    # don't see this as an error. Could move this to `setPowRequirement` if
-    # this is the general behaviour we want.
-    try:
-      waitFor node.setPowRequirement(pow)
-    except CatchableError:
-      trace "setPowRequirement error occured"
+    # Note: `setPowRequirement` does not raise on failures of sending the update
+    # to the peers. Hence in theory this should not causes errors.
+    waitFor node.setPowRequirement(pow)
     result = true
 
   # TODO: change string in to ENodeStr with extra checks
diff --git a/nimbus/rpc/whisper.nim b/nimbus/rpc/whisper.nim
index 24ff6e7c2..106f35af3 100644
--- a/nimbus/rpc/whisper.nim
+++ b/nimbus/rpc/whisper.nim
@@ -54,13 +54,9 @@ proc setupWhisperRPC*(node: EthereumNode, keys: WhisperKeys, rpcsrv: RpcServer)
     ## pow: The new PoW requirement.
     ##
     ## Returns true on success and an error on failure.
-    # Note: If any of the `peer.powRequirement` calls fails, we do not care and
-    # don't see this as an error. Could move this to `setPowRequirement` if
-    # this is the general behaviour we want.
-    try:
-      waitFor node.setPowRequirement(pow)
-    except CatchableError:
-      trace "setPowRequirement error occured"
+    # Note: `setPowRequirement` does not raise on failures of sending the update
+    # to the peers. Hence in theory this should not causes errors.
+    waitFor node.setPowRequirement(pow)
     result = true
 
   # TODO: change string in to ENodeStr with extra checks
diff --git a/waku/config.nim b/waku/config.nim
index 0f8260d76..49518f1bb 100644
--- a/waku/config.nim
+++ b/waku/config.nim
@@ -45,12 +45,12 @@ type
       name: "fleet" }: Fleet
 
     bootnodes* {.
-      desc: "Comma separated enode URLs for P2P discovery bootstrap."
-      name: "bootnodes" }: seq[string]
+      desc: "Enode URL to bootstrap P2P discovery with. Argument may be repeated."
+      name: "bootnode" }: seq[string]
 
     staticnodes* {.
-      desc: "Comma separated enode URLs to directly connect with."
-      name: "staticnodes" }: seq[string]
+      desc: "Enode URL to directly connect with. Argument may be repeated."
+      name: "staticnode" }: seq[string]
 
     whisper* {.
       desc: "Enable the Whisper protocol."
diff --git a/waku/start_network.nim b/waku/start_network.nim
index 36977c85a..fa7d40c1c 100644
--- a/waku/start_network.nim
+++ b/waku/start_network.nim
@@ -59,12 +59,12 @@ proc initNodeCmd(nodeType: NodeType, shift: int, staticNodes: seq[string] = @[],
     result.cmd &= "--discovery:on" & " "
     if bootNodes.len > 0:
       for bootNode in bootNodes:
-        result.cmd &= "--bootnodes:" & bootNode & " "
+        result.cmd &= "--bootnode:" & bootNode & " "
   else:
     result.cmd &= "--discovery:off" & " "
   if staticNodes.len > 0:
     for staticNode in staticNodes:
-      result.cmd &= "--staticnodes:" & staticNode & " "
+      result.cmd &= "--staticnode:" & staticNode & " "
 
   result.master = master
   result.enode = $enode