diff --git a/src/cntlr.c b/src/cntlr.c
index ef8938df5cdcb440ff606ddbd8c37b567a64aeef..4136520d3528e23af8ee0f198cf513b0d511b060 100644
--- a/src/cntlr.c
+++ b/src/cntlr.c
@@ -879,8 +879,9 @@ static void node_clean_stalist(struct controller *c, struct node *n)
 		cntlr_remove_sta(c, n, s);
 	}
 
-	if (n->sta_count != 0) {
-		err("%s: Misalligned station counter!\n", __func__);
+	if (WARN_ON(n->sta_count != 0)) {
+		err("%s: Misalligned station counter (cnt=%d)!\n",
+		    __func__, n->sta_count);
 		n->sta_count = 0;
 	}
 }
@@ -1433,7 +1434,6 @@ static void cntlr_metric_collection(struct controller *c)
 
 	cntlr_get_all_sta_metrics(c);
 
-
 	/* TODO: */
 	//forall_node_get_usta_metrics(c);
 
diff --git a/src/cntlr_map.c b/src/cntlr_map.c
index f335fd3b1046b991a19f26ef4b477d2b8a5bfefa..b26ba55cc82d9b3365a6f1ba0667ddce3a639b5f 100644
--- a/src/cntlr_map.c
+++ b/src/cntlr_map.c
@@ -4030,7 +4030,7 @@ int cntlr_handle_map_event(void *module, uint16_t cmdutype, uint16_t mid,
 			return -1;
 	}
 
-	/*update the timestamp of the node*/
+	/* update the timestamp of the node */
 	if (n)
 		timestamp_update(&n->last_tsp_seen);