diff --git a/go/border/internal/metrics/ctrl.go b/go/border/internal/metrics/ctrl.go
index 68a49eb94e..e525cb5b68 100644
--- a/go/border/internal/metrics/ctrl.go
+++ b/go/border/internal/metrics/ctrl.go
@@ -50,13 +50,13 @@ type control struct {
 
 func newControl() control {
 	sub := "control"
-	intf := IntfLabels{}
-	l := intf.Labels()
+	il := IntfLabels{}
+	cl := ControlLabels{}
 	return control{
 		pkts: prom.NewCounterVec(Namespace, sub,
-			"pkts_total", "Total number of processed packets.", l),
+			"pkts_total", "Total number of processed packets.", cl.Labels()),
 		ifstate: prom.NewGaugeVec(Namespace, sub,
-			"interface_active", "Interface is active.", l),
+			"interface_active", "Interface is active.", il.Labels()),
 	}
 }
 
diff --git a/go/border/internal/metrics/process.go b/go/border/internal/metrics/process.go
index 02956d7c2f..f3bdadf94c 100644
--- a/go/border/internal/metrics/process.go
+++ b/go/border/internal/metrics/process.go
@@ -49,12 +49,12 @@ type process struct {
 func newProcess() process {
 	sub := "process"
 	pl := ProcessLabels{}
-	l := pl.Labels()
+	il := IntfLabels{}
 	return process{
 		pkts: prom.NewCounterVec(Namespace, sub,
-			"pkts_total", "Total number of processed packets.", l),
+			"pkts_total", "Total number of processed packets.", pl.Labels()),
 		time: prom.NewCounterVec(Namespace, sub,
-			"time_seconds_total", "Total packet processing time.", l),
+			"time_seconds_total", "Total packet processing time.", il.Labels()),
 	}
 }
 
diff --git a/go/border/rctrl/ifstate.go b/go/border/rctrl/ifstate.go
index eeeccffa0c..593fb66203 100644
--- a/go/border/rctrl/ifstate.go
+++ b/go/border/rctrl/ifstate.go
@@ -94,9 +94,9 @@ func genIFStateReq() error {
 			errors = append(errors, common.NewBasicError("Writing IFStateReq", err, "dst", dst))
 			continue
 		}
+		logger.Debug("Sent IFStateReq", "dst", dst, "overlayDst", addr)
 		cl.Result = metrics.Success
 		metrics.Control.PktsWith(cl).Inc()
-		logger.Debug("Sent IFStateReq", "dst", dst, "overlayDst", addr)
 	}
 	return errors.ToError()
 }