diff --git a/orchagent/main.cpp b/orchagent/main.cpp
index 874fcc88df23..d373c1120ad4 100644
--- a/orchagent/main.cpp
+++ b/orchagent/main.cpp
@@ -249,7 +249,7 @@ int main(int argc, char **argv)
         SWSS_LOG_ERROR("Failed to create a switch, rv:%d", status);
         exit(EXIT_FAILURE);
     }
-    SWSS_LOG_NOTICE("Create a switch");
+    SWSS_LOG_NOTICE("Create a switch, id:%" PRIu64, gSwitchId);
 
     /* Get switch source MAC address if not provided */
     if (!gMacAddress)
diff --git a/tests/test_route.py b/tests/test_route.py
index e1c12857e3e2..2497646bdd6d 100644
--- a/tests/test_route.py
+++ b/tests/test_route.py
@@ -115,6 +115,7 @@ def test_RouteAddRemoveIpv4Route(self, dvs, testlog):
 
         # check ASIC route database
         tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ROUTE_ENTRY")
+        route_found = False
         for key in tbl.getKeys():
             route = json.loads(key)
             if route["dest"] == "2.2.2.0/24":
@@ -192,6 +193,7 @@ def test_RouteAddRemoveIpv6Route(self, dvs, testlog):
 
         # check ASIC route database
         tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ROUTE_ENTRY")
+        route_found = False
         for key in tbl.getKeys():
             route = json.loads(key)
             if route["dest"] == "3000::/64":