diff --git a/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/fpga_imp/target_fpga_pynq_z2/fpga_pinmap.xdc b/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/fpga_imp/target_fpga_pynq_z2/fpga_pinmap.xdc
index ab99a9cfac64dffa2e41732b7dba5dbe3a263e88..5599cd2eec9ca0da4c7b57e21412e609fd7d41de 100644
--- a/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/fpga_imp/target_fpga_pynq_z2/fpga_pinmap.xdc
+++ b/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/fpga_imp/target_fpga_pynq_z2/fpga_pinmap.xdc
@@ -30,3 +30,4 @@ set_property PULLUP true [get_ports PMOD0_5]
 set_property PULLUP true [get_ports PMOD0_6]
 set_property PULLUP true [get_ports PMOD0_7]
 
+set_property CLOCK_DEDICATED_ROUTE FALSE [get_nets PMOD0_7_IBUF]
diff --git a/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/fpga_imp/target_fpga_zcu104/fpga_pinmap.xdc b/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/fpga_imp/target_fpga_zcu104/fpga_pinmap.xdc
index 078c270a6038a08077ddb8d202bec06a21d748bb..4a635dde3eeee4ba52cd771abdd9df48b7e59231 100644
--- a/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/fpga_imp/target_fpga_zcu104/fpga_pinmap.xdc
+++ b/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/fpga_imp/target_fpga_zcu104/fpga_pinmap.xdc
@@ -930,6 +930,8 @@ set_property PULLUP true [get_ports PMOD0_5]
 set_property PULLUP true [get_ports PMOD0_6]
 set_property PULLUP true [get_ports PMOD0_7]
 
+set_property CLOCK_DEDICATED_ROUTE FALSE [get_nets PMOD0_7_IBUF_inst/O]
+
 #set_property IOSTANDARD LVCMOS33 [get_ports PMOD1_0]
 #set_property IOSTANDARD LVCMOS33 [get_ports PMOD1_1]
 #set_property IOSTANDARD LVCMOS33 [get_ports PMOD1_2]
diff --git a/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/verilog/cmsdk_mcu_chip.v b/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/verilog/cmsdk_mcu_chip.v
index 4af8e696780e0214107418a11826090ab920e122..33e1385c3bb79e7acfb20706b40252d1f4cd70bc 100644
--- a/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/verilog/cmsdk_mcu_chip.v
+++ b/Cortex-M0/soclabs_demo/systems/cortex_m0_mcu/verilog/cmsdk_mcu_chip.v
@@ -1032,12 +1032,20 @@ cmsdk_ahb_ram
 // I/O port pin muxing and tristate
 //----------------------------------------
 
+
   assign        i_swclktck    =  swdclk_in;
   assign        i_swditms     =  swdio_in;
   assign        swdio_out     =  i_swdo;
   assign        swdio_out_en  =  i_swdoen;
   assign        swdio_out_nen = !i_swdoen;
 
+  assign        swdclk_in     =  swdclk_i;
+  assign        swdio_in      =  swdio_i;
+
+  assign        swdio_o       =  swdio_out;
+  assign        swdio_e       =  swdio_out_en;
+  assign        swdio_z       =  swdio_out_nen;
+
   cmsdk_mcu_pin_mux
     u_pin_mux (
     // UART