diff --git a/library/axi_mc_controller/axi_mc_controller.v b/library/axi_mc_controller/axi_mc_controller.v
index cc3d8571b..c68af1adf 100644
--- a/library/axi_mc_controller/axi_mc_controller.v
+++ b/library/axi_mc_controller/axi_mc_controller.v
@@ -305,7 +305,7 @@ control_registers control_reg_inst(
     .gpo_o(gpo_o),
     .reference_speed_o(),
     .oloop_matlab_o(foc_ctrl_s),
-    .err_i(),
+    .err_i(32'h0),
     .calibrate_adcs_o(),
     .pwm_open_o(pwm_open_s));
 
@@ -688,23 +688,14 @@ up_adc_common i_up_adc_common(
     .adc_pin_mode(),
     .adc_status(1'b1),
     .adc_sync_status(1'b1),
-    .adc_status_ovf(),
-    .adc_status_unf(),
+    .adc_status_ovf(1'b0),
+    .adc_status_unf(1'b0),
     .adc_clk_ratio(32'd1),
     .adc_start_code(),
     .adc_sync(),
     .up_status_pn_err(1'b0),
     .up_status_pn_oos(1'b0),
     .up_status_or(1'b0),
-    .delay_clk(1'b0),
-    .delay_rst(),
-    .delay_sel(),
-    .delay_rwn(),
-    .delay_addr(),
-    .delay_wdata(),
-    .delay_rdata(5'd0),
-    .delay_ack_t(1'b0),
-    .delay_locked(1'b0),
     .drp_clk(1'd0),
     .drp_rst(),
     .drp_sel(),
diff --git a/library/axi_mc_current_monitor/axi_mc_current_monitor.v b/library/axi_mc_current_monitor/axi_mc_current_monitor.v
index eb903251d..679aef687 100644
--- a/library/axi_mc_current_monitor/axi_mc_current_monitor.v
+++ b/library/axi_mc_current_monitor/axi_mc_current_monitor.v
@@ -256,6 +256,8 @@ up_adc_channel #(.PCORE_ADC_CHID(1)) i_up_adc_channel_ib(
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
     .adc_iqcor_coeff_2(),
+    .adc_pnseq_sel(),
+    .adc_data_sel(),
     .adc_pn_err(1'b0),
     .adc_pn_oos(1'b0),
     .adc_or(1'b0),
@@ -300,6 +302,8 @@ up_adc_channel #(.PCORE_ADC_CHID(2)) i_up_adc_channel_vbus(
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
     .adc_iqcor_coeff_2(),
+    .adc_pnseq_sel(),
+    .adc_data_sel(),
     .adc_pn_err(1'b0),
     .adc_pn_oos(1'b0),
     .adc_or(1'b0),
@@ -344,6 +348,8 @@ up_adc_channel #(.PCORE_ADC_CHID(3)) i_up_adc_channel_stub(
     .adc_dcfilt_coeff(),
     .adc_iqcor_coeff_1(),
     .adc_iqcor_coeff_2(),
+    .adc_pnseq_sel(),
+    .adc_data_sel(),
     .adc_pn_err(1'b0),
     .adc_pn_oos(1'b0),
     .adc_or(1'b0),
@@ -386,8 +392,8 @@ up_adc_common i_up_adc_common(
     .adc_pin_mode(),
     .adc_status(1'b1),
     .adc_sync_status(1'b1),
-    .adc_status_ovf(),
-    .adc_status_unf(),
+    .adc_status_ovf(1'b0),
+    .adc_status_unf(1'b0),
     .adc_clk_ratio(32'd1),
     .adc_start_code(),
     .adc_sync(),
@@ -396,16 +402,6 @@ up_adc_common i_up_adc_common(
     .up_status_pn_oos(1'b0),
     .up_status_or(1'b0),
 
-    .delay_clk(1'b0),
-    .delay_rst(),
-    .delay_sel(),
-    .delay_rwn(),
-    .delay_addr(),
-    .delay_wdata(),
-    .delay_rdata(5'd0),
-    .delay_ack_t(1'b0),
-    .delay_locked(1'b0),
-
     .drp_clk(1'd0),
     .drp_rst(),
     .drp_sel(),
diff --git a/library/axi_mc_speed/axi_mc_speed.v b/library/axi_mc_speed/axi_mc_speed.v
index fb0d33d83..6ce2b6d1d 100644
--- a/library/axi_mc_speed/axi_mc_speed.v
+++ b/library/axi_mc_speed/axi_mc_speed.v
@@ -186,23 +186,14 @@ up_adc_common i_up_adc_common(
   .adc_pin_mode(),
   .adc_status(1'b1),
   .adc_sync_status(1'b1),
-  .adc_status_ovf(),
-  .adc_status_unf(),
+  .adc_status_ovf(1'b0),
+  .adc_status_unf(1'b0),
   .adc_clk_ratio(32'd1),
   .adc_start_code(),
   .adc_sync(),
   .up_status_pn_err(1'b0),
   .up_status_pn_oos(1'b0),
   .up_status_or(1'b0),
-  .delay_clk(1'b0),
-  .delay_rst(),
-  .delay_sel(),
-  .delay_rwn(),
-  .delay_addr(),
-  .delay_wdata(),
-  .delay_rdata(5'd0),
-  .delay_ack_t(1'b0),
-  .delay_locked(1'b0),
   .drp_clk(1'd0),
   .drp_rst(),
   .drp_sel(),