diff --git a/hw/ip/rv_dm/data/rv_dm.hjson b/hw/ip/rv_dm/data/rv_dm.hjson
index b216ec4..dc9defd 100644
--- a/hw/ip/rv_dm/data/rv_dm.hjson
+++ b/hw/ip/rv_dm/data/rv_dm.hjson
@@ -15,7 +15,8 @@
   param_list: [
     { name:    "NrHarts",
       type:    "int",
-      default: "1",
+      // TODO(b/271173103).
+      default: "2",
       desc:    "Number of hardware threads in the system."
       local:   "true"
     },
@@ -67,10 +68,12 @@
       name:    "dmactive"
       act:     "req"
     },
-    { struct:  "logic [rv_dm_reg_pkg::NrHarts-1:0]"
+    { struct:  "logic"
       type:    "uni"
       name:    "debug_req"
       act:     "req"
+      // TODO(b/271173103).
+      width:   "2"
     },
   ]
   countermeasures: [
diff --git a/hw/ip/rv_dm/rtl/rv_dm_reg_pkg.sv b/hw/ip/rv_dm/rtl/rv_dm_reg_pkg.sv
index d291d65..0b01ea9 100644
--- a/hw/ip/rv_dm/rtl/rv_dm_reg_pkg.sv
+++ b/hw/ip/rv_dm/rtl/rv_dm_reg_pkg.sv
@@ -7,7 +7,7 @@
 package rv_dm_reg_pkg;
 
   // Param list
-  parameter int NrHarts = 1;
+  parameter int NrHarts = 2;
   parameter int NumAlerts = 1;
 
   // Address widths within the block
diff --git a/util/topgen/templates/xbar_env_pkg__params.sv.tpl b/util/topgen/templates/xbar_env_pkg__params.sv.tpl
index 996511f..805b06a 100644
--- a/util/topgen/templates/xbar_env_pkg__params.sv.tpl
+++ b/util/topgen/templates/xbar_env_pkg__params.sv.tpl
@@ -21,7 +21,7 @@
         for host, devices in xbar["connections"].items():
           for dev_name in devices:
             if is_device_a_xbar(dev_name):
-              edge_devices.extend(get_xbar_edge_nodes())
+              edge_devices.extend(get_xbar_edge_nodes(dev_name))
             else:
               edge_devices.append(dev_name)