diff --git a/dbt-rise-core b/dbt-rise-core
index f0a0267..c3c48b0 160000
--- a/dbt-rise-core
+++ b/dbt-rise-core
@@ -1 +1 @@
-Subproject commit f0a0267c8e61a309c132b8a46a2d2acdafacc912
+Subproject commit c3c48b095dd5f0a9a45d6a488cd0d0375db33813
diff --git a/dbt-rise-riscv b/dbt-rise-riscv
index 2984a43..76456a4 160000
--- a/dbt-rise-riscv
+++ b/dbt-rise-riscv
@@ -1 +1 @@
-Subproject commit 2984a43885001ec6086a67b21aeac5d148327982
+Subproject commit 76456a4fca91bf4817a5c114df98cb76d9e129bf
diff --git a/scc b/scc
index 6042b2b..726a432 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 6042b2b3078f41e1e98ef18cc0eafe0d70c6091d
+Subproject commit 726a43247ca0cf5693658dde24fcff8f8988c3d7
diff --git a/src/vp/gen/PipelinedMemoryBusToApbBridge.h b/src/vp/gen/PipelinedMemoryBusToApbBridge.h
index f6be165..641c25c 100644
--- a/src/vp/gen/PipelinedMemoryBusToApbBridge.h
+++ b/src/vp/gen/PipelinedMemoryBusToApbBridge.h
@@ -12,7 +12,7 @@
 // need double braces, see
 // https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
 const std::array<scc::target_memory_map_entry<scc::LT>, 6> PipelinedMemoryBusToApbBridge_map = {{
-    {gpio0.socket, 0x0, 0xc},
+    {gpio0.socket, 0x0, 0x38},
     {uart0.socket, 0x1000, 0x14},
     {timer0.socket, 0x20000, 0x1c},
     {aclint.socket, 0x30000, 0xc000},