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 30ebcd1978623d0bb1ef725f0a0bb77987e04223..3c84dbdd3fe913696e91afa27ba9e73521924a59 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
@@ -97,9 +97,11 @@ module cmsdk_mcu_chip #(
   inout  wire          VDD,
   inout  wire          VSS,
 `endif
-  input  wire          XTAL1, // input
-  output wire          XTAL2, // output
-  input  wire          NRST,  // active low reset
+///  input  wire          XTAL1, // input
+  inout  wire          XTAL1, // input
+  inout  wire          XTAL2, // output
+///  input  wire          NRST,  // active low reset
+  inout  wire          NRST,  // active low reset
   inout  wire  [15:0]  P0,
   inout  wire  [15:0]  P1,
 
@@ -109,7 +111,8 @@ module cmsdk_mcu_chip #(
   output wire          TDO,
 `endif
   inout  wire          SWDIOTMS,
-  input  wire          SWCLKTCK);
+///  input  wire          SWCLKTCK);
+  inout  wire          SWCLKTCK);
 
 
 //------------------------------------
@@ -259,7 +262,7 @@ PAD_INOUT8MA_NOE uPAD_XTAL_I (
 PAD_INOUT8MA_NOE uPAD_XTAL_O (
    .PAD (XTAL2), 
    .O   (xtal_clk_out),
-   .I   (tielo), 
+   .I   ( ), 
    .NOE (tielo)
    );
 
@@ -828,7 +831,7 @@ PAD_INOUT8MA_NOE uPAD_P1_15 (
 
   cortexm0_rst_ctl u_rst_ctl
   (// Inputs
-   .GLOBALRESETn      (NRST),
+   .GLOBALRESETn      (nrst_in),
    .FCLK              (FCLK),
    .HCLK              (gated_hclk),
    .DCLK              (gated_dclk),
@@ -882,7 +885,7 @@ PAD_INOUT8MA_NOE uPAD_P1_15 (
 
   cm0p_ik_rst_ctl u_rst_ctl
   (// Inputs
-   .GLOBALRESETn      (NRST),
+   .GLOBALRESETn      (nrst_in),
    .FCLK              (FCLK),
    .HCLK              (gated_hclk),
    .DCLK              (gated_dclk),
@@ -1220,21 +1223,23 @@ assign ADPRESETREQ = adp_gpo8[0];
 // Flash memory
 //----------------------------------------
 cmsdk_ahb_rom
+//cmsdk_ahb_ram
   #(.MEM_TYPE(ROM_MEM_TYPE),
-//    .AW(16),  // 64K bytes flash ROM
-    .AW(13),  // 8K bytes flash ROM -Dhry
-//    .AW(10),  // 1K bytes flash ROM - Hello
-    .filename("image.hex"),
+    .AW(16),  // 64K bytes flash ROM
+//    .AW(13),  // 8K bytes flash ROM -Dhry
+///    .AW(10),  // 1K bytes flash ROM - Hello
+    .filename("../rtl_sim/image.hex"),
     .WS_N(`ARM_CMSDK_ROM_MEM_WS_N),
-    .WS_S(`ARM_CMSDK_ROM_MEM_WS_S),
-    .BE  (BE))
+    .WS_S(`ARM_CMSDK_ROM_MEM_WS_S)
+   ,.BE  (BE)
+   )
    u_ahb_rom (
     .HCLK             (HCLKSYS),
     .HRESETn          (HRESETn),
     .HSEL             (flash_hsel),  // AHB inputs
-//    .HADDR            (HADDR[15:0]),
-    .HADDR            (HADDR[12:0]),
-//    .HADDR            (HADDR[ 9:0]),
+    .HADDR            (HADDR[15:0]),
+//    .HADDR            (HADDR[12:0]),
+///    .HADDR            (HADDR[ 9:0]),
     .HTRANS           (HTRANS),
     .HSIZE            (HSIZE),
     .HWRITE           (HWRITE),
@@ -1303,18 +1308,18 @@ cmsdk_ahb_rom
 //----------------------------------------
 cmsdk_ahb_ram
   #(.MEM_TYPE(RAM_MEM_TYPE),
-///    .AW(16),  // 64K bytes SRAM
-    .AW(10),  // 1K bytes SRAM
-//    .AW( 9),  // 512 bytes SRAM
+    .AW(16),  // 64K bytes SRAM
+//    .AW(10),  // 1K bytes SRAM
+///    .AW( 9),  // 512 bytes SRAM
     .WS_N(`ARM_CMSDK_RAM_MEM_WS_N),
     .WS_S(`ARM_CMSDK_RAM_MEM_WS_S))
    u_ahb_ram (
     .HCLK             (HCLKSYS),
     .HRESETn          (HRESETn),
     .HSEL             (sram_hsel),  // AHB inputs
-///    .HADDR            (HADDR[15:0]),
-    .HADDR            (HADDR[ 9:0]),
-//    .HADDR            (HADDR[ 8:0]),
+    .HADDR            (HADDR[15:0]),
+//    .HADDR            (HADDR[ 9:0]),
+///    .HADDR            (HADDR[ 8:0]),
     .HTRANS           (HTRANS),
     .HSIZE            (HSIZE),
     .HWRITE           (HWRITE),
diff --git a/GLIB/pads/verilog/PAD_VDDIO.v b/GLIB/pads/verilog/PAD_VDDIO.v
index 793248170190fc0cebee1b3355d19ef01230d7f5..e8eda5907a536d3ecbbc2e0a2b48d1640f1f6f0b 100644
--- a/GLIB/pads/verilog/PAD_VDDIO.v
+++ b/GLIB/pads/verilog/PAD_VDDIO.v
@@ -14,4 +14,5 @@ module PAD_VDDIO (
    PAD
    );
    inout PAD;
-endmodule // PAD_VDDIO
+   assign PAD = 1'b1;
+ endmodule // PAD_VDDIO
diff --git a/GLIB/pads/verilog/PAD_VDDSOC.v b/GLIB/pads/verilog/PAD_VDDSOC.v
index 2e971192d8cf8834b02e23c2997db121e51324b0..02de9e9c8bdc45477849c9c28cc9cc1126742c32 100644
--- a/GLIB/pads/verilog/PAD_VDDSOC.v
+++ b/GLIB/pads/verilog/PAD_VDDSOC.v
@@ -15,4 +15,5 @@ module PAD_VDDSOC (
    PAD
    );
    inout PAD;
+   assign PAD = 1'b1;
 endmodule // PAD_VDDSOC
diff --git a/GLIB/pads/verilog/PAD_VSS.v b/GLIB/pads/verilog/PAD_VSS.v
index 07b87ce75b9a19404443d06a7c01bedeb4083c77..ea07cca68af27e30110d1e9352d2bac02557bed4 100644
--- a/GLIB/pads/verilog/PAD_VSS.v
+++ b/GLIB/pads/verilog/PAD_VSS.v
@@ -14,4 +14,5 @@ module PAD_VSS (
    PAD
    );
    inout PAD;
+   assign PAD = 1'b0;
 endmodule // PAD_VSS
diff --git a/GLIB/pads/verilog/PAD_VSSIO.v b/GLIB/pads/verilog/PAD_VSSIO.v
index d25ef361fb315640284a13be8ab1658e359e5b77..42d9edbf93686652d35da854b080124a32473132 100644
--- a/GLIB/pads/verilog/PAD_VSSIO.v
+++ b/GLIB/pads/verilog/PAD_VSSIO.v
@@ -14,5 +14,6 @@ module PAD_VSSIO (
    PAD
    );
    inout PAD;
+   assign PAD = 1'b0;
 endmodule // PAD_VSSIO