diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 418e0af16b..c19fb3244e 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -2357,10 +2357,12 @@ static void show_isis_topology_common(struct vty *vty, int levels,
 			fa_data = (struct isis_flex_algo_data *)fa->data;
 		} else
 			fa_data = NULL;
+#endif /* ifndef FABRICD */
 
 		vty_out(vty,
 			"Area %s:", area->area_tag ? area->area_tag : "null");
 
+#ifndef FABRICD
 		if (algo != SR_ALGORITHM_SPF)
 			vty_out(vty, " Algorithm %hhu\n", algo);
 		else
@@ -3123,8 +3125,7 @@ DEFUN(show_isis_route, show_isis_route_cmd,
 #ifndef FABRICD
 	if (argv_find(argv, argc, "algorithm", &idx)) {
 		if (argv_find(argv, argc, "(128-255)", &idx))
-			algorithm = (uint8_t)strtoul(argv[idx + 1]->arg, NULL,
-						     10);
+			algorithm = (uint8_t)strtoul(argv[idx]->arg, NULL, 10);
 		else
 			all_algorithm = true;
 	}
diff --git a/isisd/isis_sr.c b/isisd/isis_sr.c
index af22f56f8b..f783038006 100644
--- a/isisd/isis_sr.c
+++ b/isisd/isis_sr.c
@@ -1020,8 +1020,6 @@ static void show_node(struct vty *vty, struct isis_area *area, int level,
 	struct ttable *tt;
 	char buf[128];
 
-	vty_out(vty, " IS-IS %s SR-Nodes:\n\n", circuit_t2string(level));
-
 	/* Prepare table. */
 	tt = ttable_new(&ttable_styles[TTSTYLE_BLANK]);
 	ttable_add_row(tt, "System ID|SRGB|SRLB|Algorithm|MSD");
@@ -1062,6 +1060,8 @@ static void show_node(struct vty *vty, struct isis_area *area, int level,
 	if (tt->nrows > 1) {
 		char *table;
 
+		vty_out(vty, " IS-IS %s SR-Nodes:\n\n", circuit_t2string(level));
+
 		table = ttable_dump(tt, "\n");
 		vty_out(vty, "%s\n", table);
 		XFREE(MTYPE_TMP, table);