diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 714d6e8e1d..ae5b7940e9 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -6057,7 +6057,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
 		vty_out(vty,
 			"       R - SGRpt Pruned, F - Register flag, T - SPT-bit set\n");
 		vty_out(vty,
-			"\nSource          Group           Flags   Proto  Input            Output           TTL  Uptime\n");
+			"\nSource          Group           Flags    Proto  Input            Output           TTL  Uptime\n");
 	}
 
 	now = pim_time_monotonic_sec();
@@ -6247,7 +6247,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
 				}
 
 				vty_out(vty,
-					"%-15s %-15s %-15s %-6s %-16s %-16s %-3d  %8s\n",
+					"%-15s %-15s %-8s %-6s %-16s %-16s %-3d  %8s\n",
 					src_str, grp_str, state_str, proto,
 					in_ifname, out_ifname, ttl,
 					mroute_uptime);
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index 1488cc1775..dd03f83778 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -294,8 +294,11 @@ static int static_route_leak(struct vty *vty, const char *svrf,
 				 buf_gate_str, ifname);
 
 		dnode = yang_dnode_get(vty->candidate_config->dnode, ab_xpath);
-		if (!dnode)
+		if (!dnode) {
+			vty_out(vty,
+				"%% Refusing to remove a non-existent route\n");
 			return ret;
+		}
 
 		dnode = yang_get_subtree_with_no_sibling(dnode);
 		assert(dnode);
diff --git a/tests/topotests/lib/bgp.py b/tests/topotests/lib/bgp.py
index 65e5840622..55b11dab3c 100644
--- a/tests/topotests/lib/bgp.py
+++ b/tests/topotests/lib/bgp.py
@@ -3880,6 +3880,7 @@ def verify_attributes_for_evpn_routes(
                             return errormsg
 
                     if rt == "auto":
+                        vni_dict = {}
                         logger.info(
                             "[DUT: %s]: Verifying auto-rt value for " "evpn route %s:",
                             dut,
@@ -3887,8 +3888,6 @@ def verify_attributes_for_evpn_routes(
                         )
 
                         if rt_peer:
-                            vni_dict = {}
-
                             rnode = tgen.routers()[rt_peer]
                             show_bgp_json = run_frr_cmd(
                                 rnode, "show bgp vrf all summary json", isjson=True
diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py
index ce35bdc0fe..fd480aba73 100644
--- a/tests/topotests/lib/common_config.py
+++ b/tests/topotests/lib/common_config.py
@@ -336,16 +336,15 @@ def start_router_daemons(tgen, router, daemons):
         router_list = tgen.routers()
 
         # Start daemons
-        result = router_list[router].startDaemons(daemons)
-        return result
+        res = router_list[router].startDaemons(daemons)
 
     except Exception as e:
         errormsg = traceback.format_exc()
         logger.error(errormsg)
-        return errormsg
+        res = errormsg
 
     logger.debug("Exiting lib API: {}".format(sys._getframe().f_code.co_name))
-    return True
+    return res
 
 
 def kill_mininet_routers_process(tgen):
@@ -1376,12 +1375,14 @@ def generate_ips(network, no_of_ips):
                 return ipaddress_list
             start_ip = ipaddress.IPv4Address(unicode(start_ip))
             step = 2 ** (32 - mask)
-        if addr_type == "ipv6":
+        elif addr_type == "ipv6":
             if start_ip == "0::0" and mask == 0 and no_of_ips == 1:
                 ipaddress_list.append("{}/{}".format(start_ip, mask))
                 return ipaddress_list
             start_ip = ipaddress.IPv6Address(unicode(start_ip))
             step = 2 ** (128 - mask)
+        else:
+            return []
 
         next_ip = start_ip
         count = 0