diff --git a/hal/nanosoc_ip.waive b/hal/nanosoc_ip.waive
index d962f6191c45b93d0f89cd071c6b7e6a08d41a41..9a4680b7285ec9bec6c33fe93008b8f6fb27f084 100644
--- a/hal/nanosoc_ip.waive
+++ b/hal/nanosoc_ip.waive
@@ -19,6 +19,24 @@ lint_checking designunit = nanosoc_chip_pads
     
     // Input/Output PIns decalred as inout so may have multiple drivers
     GLTASR off;
+    
+    // Simple Glue-logic at top-level
+    ATLGLC off;
+    
+    // Inout Pads at top-level
+    IOCOMB {"P0|P1"} off;
+    IOPNTA {"XTAL1|XTAL2|NRST|P0|P1|SWDIOTMS|SWCLKTCK"} off;
+    MULWIR {"XTAL1|XTAL2|NRST|P0|P1|SWDIOTMS|SWCLKTCK"} off;
+    
+    // Reset Name Changes in hierarchy
+    RSTUCL {"PRESETn"} off;
+    
+    // Output on pad disconnected
+    UNCONN {"uPAD_XTAL_O"} off;
+    
+    // Pad output signals not wired up (Technology dependent)
+    UNCONO {"p0_e|p1_e|swdio_e|I"} off;
+    URDWIR {"p0_e|p1_e|swdio_e"} off;
 }
 
 lint_checking designunit = nanosoc_chip
@@ -304,6 +322,9 @@ lint_checking designunit = nanosoc_clkctrl
     
     // Some Ports Unused (Arm IP)
     USEPRT off;
+    
+    // Asynchronous Reset
+    ACNCPI {"NRST"} off;
 }
 
 lint_checking designunit = nanosoc_pin_mux
diff --git a/system/nanosoc_chip/pads/glib/verilog/nanosoc_chip_pads.v b/system/nanosoc_chip/pads/glib/verilog/nanosoc_chip_pads.v
index e994acb80d19c0dd2e7754bb0d080b262cb5fc3d..a54aec51c74a46b4ebbd39bf6360b243df7ca83f 100644
--- a/system/nanosoc_chip/pads/glib/verilog/nanosoc_chip_pads.v
+++ b/system/nanosoc_chip/pads/glib/verilog/nanosoc_chip_pads.v
@@ -6,7 +6,7 @@
 //
 // David Flynn (d.w.flynn@soton.ac.uk)
 //
-// Copyright � 2021-3, SoC Labs (www.soclabs.org)
+// Copyright � 2021-3, SoC Labs (www.soclabs.org)
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
@@ -77,8 +77,7 @@ module nanosoc_chip_pads (
  // Cortex-M0 nanosoc Microcontroller
  // --------------------------------------------------------------------------------
 
-  nanosoc_chip
-   u_nanosoc_chip (
+  nanosoc_chip u_nanosoc_chip (
 `ifdef POWER_PINS
   .VDDIO      (VDDIO),
   .VSSIO      (VSSIO),