diff --git a/map-agent/Config.in b/map-agent/Config.in
index d69ada968..10bf2183d 100644
--- a/map-agent/Config.in
+++ b/map-agent/Config.in
@@ -20,7 +20,7 @@ config AGENT_EASYMESH_VENDOR_EXT
 
 config AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	string
-	default "\\\\x11\\\\x22\\\\x33"
+	default "\\\\x00\\\\x22\\\\x07"
 
 config AGENT_EASYMESH_VENDOR_EXT_OUI
 	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
diff --git a/map-controller/Config.in b/map-controller/Config.in
index 798361102..16ecbed8c 100644
--- a/map-controller/Config.in
+++ b/map-controller/Config.in
@@ -12,7 +12,7 @@ config CONTROLLER_EASYMESH_VENDOR_EXT
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	string
-	default "\\\\x11\\\\x22\\\\x33"
+	default "\\\\x00\\\\x22\\\\x07"
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
diff --git a/map-topology/Config.in b/map-topology/Config.in
index 31556ac5a..71ad72cb2 100644
--- a/map-topology/Config.in
+++ b/map-topology/Config.in
@@ -8,7 +8,7 @@ config TOPOLOGYD_EASYMESH_VENDOR_EXT
 
 config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	string
-	default "\\\\x11\\\\x22\\\\x33"
+	default "\\\\x00\\\\x22\\\\x07"
 
 config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
 	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
diff --git a/port-management/files/etc/uci-defaults/15-ports-config-generate b/port-management/files/etc/uci-defaults/15-ports-config-generate
index ca7cfe02f..a3e5e6e64 100644
--- a/port-management/files/etc/uci-defaults/15-ports-config-generate
+++ b/port-management/files/etc/uci-defaults/15-ports-config-generate
@@ -73,7 +73,7 @@ fi
 
 touch /etc/config/ports
 
-if [ -f /sbin/db ] && [ -f /etc/board-db/config/hw ]; then
+if [ -f /sbin/db -a -n "$(db get hw.board.ethernetPortOrder 2>/dev/null)" ]; then
 	populate_config_from_db
 elif [ -d /proc/device-tree/ ]; then
 	populate_config_from_device_tree