diff --git a/config/config.mk b/config/config.mk
index 0b424a1be..a3b134fc2 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -50,7 +50,7 @@ axi_data_width ?= 512
 ro_line_width ?= 512
 
 # Number of DMA backends in each group
-dmas_per_group ?= 4
+dmas_per_group ?= 8
 
 #############################
 ##  Xqueues configuration  ##
diff --git a/config/terapool.mk b/config/terapool.mk
index 4a28e6fb0..e1d474cbc 100644
--- a/config/terapool.mk
+++ b/config/terapool.mk
@@ -31,7 +31,7 @@ banking_factor ?= 4
 remote_group_latency_cycles ?= 7
 
 # Radix for hierarchical AXI interconnect
-axi_hier_radix ?= 9
+axi_hier_radix ?= 10
 
 # Number of AXI masters per group
 axi_masters_per_group ?= 4
diff --git a/hardware/src/mempool_cc.sv b/hardware/src/mempool_cc.sv
index ef3daff45..13b690372 100644
--- a/hardware/src/mempool_cc.sv
+++ b/hardware/src/mempool_cc.sv
@@ -196,6 +196,7 @@ module mempool_cc
   assign data_resp_d_valid = data_pvalid_i;
   assign data_pready_o     = data_resp_d_ready;
 
+`ifndef POSTLAYOUT
   // --------------------------
   // Tracer
   // --------------------------
@@ -319,5 +320,6 @@ module mempool_cc
     $fclose(f);
   end
   // pragma translate_on
+`endif
 
 endmodule
diff --git a/hardware/src/mempool_pkg.sv b/hardware/src/mempool_pkg.sv
index 9a457401c..8698ac013 100644
--- a/hardware/src/mempool_pkg.sv
+++ b/hardware/src/mempool_pkg.sv
@@ -290,7 +290,7 @@ package mempool_pkg;
    *  TeraPool PARAMETERS  *
    *************************/
 
-  localparam integer unsigned NumSubGroupsPerGroup = `ifdef TERAPOOL `NUM_SUB_GROUPS_PER_GROUP `else 1 `endif;
+  localparam integer unsigned NumSubGroupsPerGroup = `ifdef NUM_SUB_GROUPS_PER_GROUP `NUM_SUB_GROUPS_PER_GROUP `else 1 `endif;
 
   // TeraPool Tile Config
   localparam integer unsigned NumSubGroups         = NumGroups * NumSubGroupsPerGroup;