diff --git a/Makefile b/Makefile
index 927105d4f..f94ec7bfb 100644
--- a/Makefile
+++ b/Makefile
@@ -926,7 +926,7 @@ endif
 
 ifneq ($(NEED_POSIX_SOCKETS), )
 ifeq ($(TARGET_OS), SunOS)
-LIBS += -lsocket
+LIBS += -lsocket -lnsl
 endif
 endif
 
diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c
index c3d9ba164..ad3b6f00c 100644
--- a/util/ich_descriptors_tool/ich_descriptors_tool.c
+++ b/util/ich_descriptors_tool/ich_descriptors_tool.c
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
 		usage(argv, "Seeking to the end of the file failed");
 
 #ifdef HAVE_MMAP
-	buf = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
+	buf = (uint32_t *)mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (buf == (void *) -1)
 #endif
 	{