diff --git a/makefile b/makefile
index 418352a8da1222319549c5137dcbb637e7efd4d6..1e616821bbfad27ee59b3e73d050d76858135724 100644
--- a/makefile
+++ b/makefile
@@ -37,6 +37,9 @@
 #
 #  Configurations
 
+# Include Lint Checks
+include $(SOCLABS_SOCTOOLS_FLOW_DIR)/resources/hal/makefile.hal_checks
+
 # Directory of Testcodes
 NANOSOC_SYSTEM_DIR ?= $(SOCLABS_NANOSOC_TECH_DIR)/system
 NANOSOC_SW_DIR     ?= $(SOCLABS_NANOSOC_TECH_DIR)/software
@@ -110,33 +113,6 @@ 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 
-
-# Constant values used in signal widths
-LINT_NOCHECK += -nocheck STYVAL
-
-# Maximum Length of HDL Lines exceeded (Don't care)
-LINT_NOCHECK += -nocheck MAXLEN
-
-# Outputs Assigned Asynchronously (Multiple layers of wiring)
-LINT_NOCHECK += -nocheck SYNPRT
-
-# Bitwidth not specified for Parameters
-LINT_NOCHECK += -nocheck PRMVAL
-
-# Base not specified for Parameters
-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
-
 # MTI option
 #DF#MTI_OPTIONS    = -novopt
 MTI_OPTIONS    = -suppress 2892
@@ -223,7 +199,7 @@ compile_xm : bootrom
 	cd $(SIM_DIR); xmvlog  -work worklib -f xmvlog_sv.args -f xmvlog_ver.args -sv | tee -a compile_xm.log
 	cd $(SIM_DIR); xmelab  -mess -f xmelab.args -access +r | tee -a compile_xm.log
 
-lint_xm: compile_xm
+lint_xm: bootrom
 	@rm -rf $(LINT_DIR) 
 	@mkdir -p $(LINT_DIR)
 	cd $(LINT_DIR); hal -f $(DESIGN_VC) $(DEFINES_VC) +debug -XMVERILOGARGS "-timescale 1ps/1ps" -top nanosoc_chip_pads $(HAL_BLACK_BOX) $(HAL_WAIVE) $(LINT_NOCHECK)
diff --git a/system/slcorem0_tech b/system/slcorem0_tech
index 61377733f126b28baa5ed84eae9a4d1ab0109119..d8d9c80f3bc2307ff8b71d2b32b6b14bb864c7cc 160000
--- a/system/slcorem0_tech
+++ b/system/slcorem0_tech
@@ -1 +1 @@
-Subproject commit 61377733f126b28baa5ed84eae9a4d1ab0109119
+Subproject commit d8d9c80f3bc2307ff8b71d2b32b6b14bb864c7cc