diff --git a/.gitmodules b/.gitmodules
index aa622e6..0b1e81f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "utils"]
 	path = utils
-	url = https://github.com/goToMain/c-utils.git
+	url = https://github.com/rustylocker/c-utils.git
+	branch = fix-zephyr-and-gcc-build-issues
diff --git a/src/osdp_cp.c b/src/osdp_cp.c
index a2d16de..d3f0e69 100644
--- a/src/osdp_cp.c
+++ b/src/osdp_cp.c
@@ -181,6 +181,8 @@ static inline void assert_buf_len(int need, int have)
 {
 	__ASSERT(need < have, "OOM at build command: need:%d have:%d",
 		 need, have);
+	(void)need;
+	(void)have;
 }
 
 static int cp_build_command(struct osdp_pd *pd, uint8_t *buf, int max_len)
diff --git a/src/osdp_pd.c b/src/osdp_pd.c
index 6d289c1..1541407 100644
--- a/src/osdp_pd.c
+++ b/src/osdp_pd.c
@@ -748,6 +748,8 @@ static inline void assert_buf_len(int need, int have)
 {
 	__ASSERT(need < have, "OOM at build command: need:%d have:%d",
 		 need, have);
+	(void)need;
+	(void)have;
 }
 
 /**
diff --git a/utils b/utils
index c6d562e..366559c 160000
--- a/utils
+++ b/utils
@@ -1 +1 @@
-Subproject commit c6d562eb88d80774d62c8ebac3a2c32e5a0c97e5
+Subproject commit 366559cba1190e240f9a58a0c6b40f0180f516df