diff --git a/manifest b/manifest
index d7840c50..d8669400 100644
--- a/manifest
+++ b/manifest
@@ -7,10 +7,10 @@
 cc82a78753f5f5d0a1519bd81adbcff8a4296d91  verilog/rtl/__user_project_wrapper.v
 3c8c04f53b2848dc46132cda82c614e06e56571b  verilog/rtl/buff_flash_clkrst.v
 14064261ec18d633a5d72b45b2347c388f2f446f  verilog/rtl/caravan.v
-120661aaee20d83948e5e419a88ca9b63531ec95  verilog/rtl/caravan_core.v
+502219ed86a5c1707bd0cf636f3b61de78f159d8  verilog/rtl/caravan_core.v
 e68fd2e085679d0f61040115fdd1d50651705d3a  verilog/rtl/caravan_logo.v
 d265ea6bf861e3f5c1b1b984ae057dbaed995008  verilog/rtl/caravan_motto.v
-d36e539fad7563a03974cb7d18489e6a0ccfe80d  verilog/rtl/caravan_netlists.v
+baf7cf0e8a8a712621aed75aff98198a663db43b  verilog/rtl/caravan_netlists.v
 a3d12a2d2d3596800bec47d1266dce2399a2fcc6  verilog/rtl/caravan_openframe.v
 b532b4c6315c29fd19fe38ac221b6fc41e6f5ecb  verilog/rtl/caravan_power_routing.v
 fa26aa34b4b382aacad9b7ac07a36b17172a401f  verilog/rtl/caravel.v
diff --git a/verilog/rtl/caravan_core.v b/verilog/rtl/caravan_core.v
index 6f4e9a9e..c3a2714d 100644
--- a/verilog/rtl/caravan_core.v
+++ b/verilog/rtl/caravan_core.v
@@ -123,10 +123,10 @@ module caravan_core (
     // User project direct access to gpio pad connections for analog
     // (all but the lowest-numbered 7 pads)
     inout [`MPRJ_IO_PADS-`ANALOG_PADS-10:0] user_gpio_analog,
-	inout [`MPRJ_IO_PADS-`ANALOG_PADS-10:0] user_gpio_noesd,
-	inout [`ANALOG_PADS-1:0] user_analog,
-	inout [2:0] user_clamp_high,
-    inout wire [2:0] user_clamp_low
+    inout [`MPRJ_IO_PADS-`ANALOG_PADS-10:0] user_gpio_noesd,
+    inout [`ANALOG_PADS-1:0] user_analog,
+    inout [2:0] user_clamp_high,
+    inout [2:0] user_clamp_low
 );
 
     //------------------------------------------------------------
diff --git a/verilog/rtl/caravan_netlists.v b/verilog/rtl/caravan_netlists.v
index b0737feb..fd05b632 100644
--- a/verilog/rtl/caravan_netlists.v
+++ b/verilog/rtl/caravan_netlists.v
@@ -97,11 +97,16 @@
 	`include "buff_flash_clkrst.v"
 	`include "RAM128.v"
 	`include "RAM256.v"
-	`include "VexRiscv_MinDebug.v"
+	`include "VexRiscv_MinDebugCache.v"
 	`include "mgmt_core.v"
 	`include "caravan.v"
     `endif
 
     `include "simple_por.v"
-
+	`include "caravan_core.v" 
+	`include "caravan_logo.v"
+	`include "caravan_motto.v" 
+	`include "copyright_block_a.v"
+	`include "open_source.v" 
+	`include "user_id_textblock.v"
 `endif