diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index 51ca3378a24..fef6077a991 100644
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -66,5 +66,3 @@ OBJ_FILES = \
 OBJ_FILES = db_wrap.o \
 		gendb.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB
-
-
diff --git a/source/lib/socket/config.mk b/source/lib/socket/config.mk
index c76c91ba8c9..e9f29b07905 100644
--- a/source/lib/socket/config.mk
+++ b/source/lib/socket/config.mk
@@ -44,6 +44,6 @@ OBJ_FILES = \
 		connect_multi.o \
 		connect.o
 NOPROTO=YES
-REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE
+REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE SOCKET_WRAPPER LIBTALLOC
 # End SUBSYSTEM SOCKET
 ################################################
diff --git a/source/lib/util/config.mk b/source/lib/util/config.mk
index 79e145775d7..81614ed6470 100644
--- a/source/lib/util/config.mk
+++ b/source/lib/util/config.mk
@@ -1,6 +1,15 @@
-[SUBSYSTEM::LIBBASIC]
+[LIBRARY::LIBBASIC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION = Generic utility functions
 PRIVATE_PROTO_HEADER = util_proto.h
-PUBLIC_HEADERS = util.h
+PUBLIC_HEADERS = util.h \
+				 byteorder.h \
+				 debug.h \
+				 mutex.h \
+				 safe_string.h \
+				 xfile.h
 OBJ_FILES = xfile.o \
 		debug.o \
 		fault.o \
diff --git a/source/lib/util/ms_fnmatch.c b/source/lib/util/ms_fnmatch.c
index 699341bede5..d44c8b87da1 100644
--- a/source/lib/util/ms_fnmatch.c
+++ b/source/lib/util/ms_fnmatch.c
@@ -161,7 +161,7 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
 	}
 
 	if (strpbrk(pattern, "<>*?\"") == NULL) {
-		/* this is not just an optmisation - it is essential
+		/* this is not just an optimisation - it is essential
 		   for LANMAN1 correctness */
 		return strcasecmp_m(pattern, string);
 	}