diff --git a/grafazos/src/base.jsonnet b/grafazos/src/base.jsonnet
index 6501842b1b67ee1cd056b23f47e96d268c04c7f1..a0ec2a02f274744bba198040718fdf0219c07a9e 100644
--- a/grafazos/src/base.jsonnet
+++ b/grafazos/src/base.jsonnet
@@ -60,7 +60,7 @@ local logs = panel.logs;
         else q;
         stat.new(title)
         + stat.panelOptions.withGridPos(h, w, x, y)
-        + stat.queryOptions.withTargets(q)
+        + stat.queryOptions.withTargets(q0)
         + stat.options.withGraphMode('none')
         + stat.options.withColorMode('none'),
 
diff --git a/grafazos/src/node.jsonnet b/grafazos/src/node.jsonnet
index d6bfb080c844cf2c1da7e29083b026a688821f60..a4802072adce3a8483cb6ac75417b0519380d014 100644
--- a/grafazos/src/node.jsonnet
+++ b/grafazos/src/node.jsonnet
@@ -29,10 +29,8 @@ local timeSeries = panel.timeSeries;
 // Base
 local base = import './base.jsonnet';
 local namespace = base.namespace;
-local node_instance = base.node_instance;
 local prometheus = base.prometheus;
 local info = base.info;
-local infoName = base.infoName;
 local graph = base.graph;
 local table = base.table;
 
diff --git a/grafazos/src/p2p.jsonnet b/grafazos/src/p2p.jsonnet
index 555ee50c299e5349595ed0a0e1fe5f890a41a62f..c3026e2e2c7c3075973551dca2948b3c87af23db 100644
--- a/grafazos/src/p2p.jsonnet
+++ b/grafazos/src/p2p.jsonnet
@@ -23,17 +23,13 @@
 local grafonnet = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 local query = grafonnet.query;
 local panel = grafonnet.panel;
-local table = panel.table;
-local timeSeries = panel.timeSeries;
 local stat = panel.stat;
 
 // Base
 local base = import './base.jsonnet';
 local namespace = base.namespace;
-local node_instance = base.node_instance;
 local prometheus = base.prometheus;
 local info = base.info;
-local infoName = base.infoName;
 local graph = base.graph;
 local table = base.table;
 
diff --git a/grafazos/src/rpc.jsonnet b/grafazos/src/rpc.jsonnet
index 7a3cadc44ff8522410fab82ea6dbc8a502f64ac0..0d76386282b0a7c23c1ce1dc25e9194c813e8ca0 100644
--- a/grafazos/src/rpc.jsonnet
+++ b/grafazos/src/rpc.jsonnet
@@ -28,13 +28,8 @@ local timeSeries = panel.timeSeries;
 
 // Base
 local base = import './base.jsonnet';
-local namespace = base.namespace;
-local node_instance = base.node_instance;
-local prometheus = base.prometheus;
 local info = base.info;
-local infoName = base.infoName;
 local graph = base.graph;
-local table = base.table;
 
 
 //##
diff --git a/grafazos/src/workers.jsonnet b/grafazos/src/workers.jsonnet
index faeb57599520554016fe923b7d664318937cf7d7..ec9b3a8e5b7a2861e5d0e6fc465389333535e049 100644
--- a/grafazos/src/workers.jsonnet
+++ b/grafazos/src/workers.jsonnet
@@ -127,7 +127,7 @@ local graph = base.graph;
     local unavailableProtocolQuery = prometheus('validator_peer_unavailable_protocol', legendFormat=unavailableProtocol);
     local unknownAncestorQuery = prometheus('validator_peer_unknown_ancestor', legendFormat=unknownAncestor);
     local UnknownError = prometheus('validator_peer_unknown_error', legendFormat=unknownError);
-    graph.new('Peer validators', [connectionsQuery, invalidBlocksQuery, invalidLocatorQuery, newBranchCompeletedQuery, newHeadCompletedQuery, onNoRequestQuery, newKnownValidHeadQuery, newUnknownHeadQuery, systemErrorQuery, tooShortLocatorQuery, unavailableProtocolQuery, unknownAncestorQuery, UnknownError], h, w, x, y)
+    graph.new('Peer validators', [connectionsQuery, invalidBlocksQuery, invalidLocatorQuery, newBranchCompeletedQuery, newHeadCompletedQuery, onNoRequestQuery, newBranchQuery, newKnownValidHeadQuery, newUnknownHeadQuery, systemErrorQuery, tooShortLocatorQuery, unavailableProtocolQuery, unknownAncestorQuery, UnknownError], h, w, x, y)
     + graph.withLogScale()
     + graph.withQueryColor([[connections, 'light-green'], [invalidBlocks, 'light-red'], [invalidLocator, 'light-orange'], [newBranchCompleted, 'light-blue'], [newHeadCompleted, 'blue'], [onNoRequest, 'white'], [newBranch, 'green'], [newKnownValidHead, 'light-yellow'], [newUnknownHead, 'light-orange'], [systemError, 'orange'], [tooShortLocator, 'brown'], [unavailableProtocol, 'light-red'], [unknownAncestor, 'yellow'], [unknownError, 'red']]),