diff --git a/dbt-rise-core b/dbt-rise-core
index fa86b08..29e97c0 160000
--- a/dbt-rise-core
+++ b/dbt-rise-core
@@ -1 +1 @@
-Subproject commit fa86b089813870727047bbe437a4c212dd334c26
+Subproject commit 29e97c021c988370f5c5af5b5076afe8043402b6
diff --git a/dbt-rise-riscv b/dbt-rise-riscv
index 64967f7..e7745da 160000
--- a/dbt-rise-riscv
+++ b/dbt-rise-riscv
@@ -1 +1 @@
-Subproject commit 64967f772c1d25434e0db0d17f6d1c8b4dfa5738
+Subproject commit e7745dae8e6e439977902ea82e7e3642f90c0925
diff --git a/scc b/scc
index 9a76798..557b856 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 9a76798134319a5e1f176a0073d1b03eed64eb2e
+Subproject commit 557b856dd2907429f1b7cbbebf02de776dfed455
diff --git a/src/vp/system.cpp b/src/vp/system.cpp
index 9177228..d5dfc67 100644
--- a/src/vp/system.cpp
+++ b/src/vp/system.cpp
@@ -129,7 +129,7 @@ void system::start_of_simulation() {
         gp.set_command(tlm::TLM_IGNORE_COMMAND);
         gp.set_data_length(trace_buffer.size());
         gp.set_streaming_width(trace_buffer.size());
-        scc::host_mem_map_extension ext{trace_buffer.data()};
+        scc::host_mem_map_extension ext{trace_buffer.data(), trace_buffer.size()};
         gp.set_extension(&ext);
         mem_trace.target.get_base_interface().transport_dbg(gp);
         gp.set_extension<scc::host_mem_map_extension>(nullptr);
diff --git a/src/vp/system.h b/src/vp/system.h
index 6f81b15..60f1042 100644
--- a/src/vp/system.h
+++ b/src/vp/system.h
@@ -56,7 +56,7 @@ public:
     system(sc_core::sc_module_name nm);
 
 private:
-#include "../vp/gen/PipelinedMemoryBusToApbBridge.h" // IWYU pragma: keep
+#include "gen/PipelinedMemoryBusToApbBridge.h" // IWYU pragma: keep
     sysc::riscv::core_complex<> core_complex{"core_complex"};
     scc::router<> main_bus, peripheral_bus;
     vpvper::minres::gpio_tl gpio0{"gpio0"};