diff --git a/lint/corstone101_ip.bb b/hal/corstone101_ip.bb
similarity index 100%
rename from lint/corstone101_ip.bb
rename to hal/corstone101_ip.bb
diff --git a/lint/nanosoc_ip.bb b/hal/nanosoc_ip.bb
similarity index 100%
rename from lint/nanosoc_ip.bb
rename to hal/nanosoc_ip.bb
diff --git a/lint/nanosoc_ip.waive b/hal/nanosoc_ip.waive
similarity index 100%
rename from lint/nanosoc_ip.waive
rename to hal/nanosoc_ip.waive
diff --git a/makefile b/makefile
index 3432f218e25d35750cd068e8acaf729be910ab41..418352a8da1222319549c5137dcbb637e7efd4d6 100644
--- a/makefile
+++ b/makefile
@@ -106,9 +106,9 @@ SIM_TOP_DIR ?= $(SOCLABS_PROJECT_DIR)/simulate/sim
 SIM_DIR = $(SIM_TOP_DIR)/$(TESTNAME)
 
 LINT_DIR = $(SOCLABS_PROJECT_DIR)/lint/nanosoc
-LINT_INFO_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/lint
-LINT_INFO_SLCOREM0_DIR = $(SOCLABS_SLCOREM0_TECH_DIR)/lint
-LINT_INFO_SLDMA230_DIR = $(SOCLABS_SLDMA230_TECH_DIR)/lint
+LINT_INFO_DIR = $(SOCLABS_NANOSOC_TECH_DIR)/hal
+LINT_INFO_SLCOREM0_DIR = $(SOCLABS_SLCOREM0_TECH_DIR)/hal
+LINT_INFO_SLDMA230_DIR = $(SOCLABS_SLDMA230_TECH_DIR)/hal
 
 # Capitalised Names used for Wires
 LINT_NOCHECK  = -nocheck LCVARN 
@@ -131,6 +131,9 @@ LINT_NOCHECK += -nocheck PRMBSE
 # Constants Used in Port Expressions (To tie them off)
 LINT_NOCHECK += -nocheck IPRTEX
 
+# Compiler Directives Used in RTL
+LINT_NOCHECK += -nocheck CDWARN
+
 # TODO: Control Characters (May need to be investigated!)
 LINT_NOCHECK += -nocheck CTLCHR
 
diff --git a/system/slcorem0_tech b/system/slcorem0_tech
index 2e3ae3bc669358a1ee423bb8f2af6e8e5c628966..61377733f126b28baa5ed84eae9a4d1ab0109119 160000
--- a/system/slcorem0_tech
+++ b/system/slcorem0_tech
@@ -1 +1 @@
-Subproject commit 2e3ae3bc669358a1ee423bb8f2af6e8e5c628966
+Subproject commit 61377733f126b28baa5ed84eae9a4d1ab0109119
diff --git a/system/sldma230_tech b/system/sldma230_tech
index c4c185f9243219e2b1a0118916f2351db6104311..d6aef842cb3923fbab31d7b4174e9e15e877a15e 160000
--- a/system/sldma230_tech
+++ b/system/sldma230_tech
@@ -1 +1 @@
-Subproject commit c4c185f9243219e2b1a0118916f2351db6104311
+Subproject commit d6aef842cb3923fbab31d7b4174e9e15e877a15e