diff --git a/config/user-libuuid.m4 b/config/user-libuuid.m4
index 0a669b7d6a..aba375a228 100644
--- a/config/user-libuuid.m4
+++ b/config/user-libuuid.m4
@@ -5,13 +5,13 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBUUID], [
 	LIBUUID=
 
 	AC_CHECK_HEADER([uuid/uuid.h], [], [AC_MSG_FAILURE([
-	*** uuid/uuid.h missing, e2fsprogs-devel package required])])
+	*** uuid/uuid.h missing, libuuid-devel package required])])
 
 	AC_CHECK_LIB([uuid], [uuid_generate], [], [AC_MSG_FAILURE([
-	*** uuid_generate() missing, e2fsprogs-devel package required])])
+	*** uuid_generate() missing, libuuid-devel package required])])
 
 	AC_CHECK_LIB([uuid], [uuid_is_null], [], [AC_MSG_FAILURE([
-	*** uuid_is_null() missing, e2fsprogs-devel package required])])
+	*** uuid_is_null() missing, libuuid-devel package required])])
 
 	AC_SUBST([LIBUUID], ["-luuid"])
 	AC_DEFINE([HAVE_LIBUUID], 1, [Define if you have libuuid])
diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
index 744d2d2423..705f02a250 100644
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@ -37,6 +37,7 @@
 #include <strings.h>
 #include <unistd.h>
 #include <zone.h>
+#include <sys/stat.h>
 #include <sys/efi_partition.h>
 #include <sys/vtoc.h>
 #include <sys/zfs_ioctl.h>
diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index c1f09e3c38..37ea2cf390 100644
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -37,6 +37,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <math.h>
+#include <sys/stat.h>
 #include <sys/mnttab.h>
 #include <sys/mntent.h>
 #include <sys/types.h>
diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 07582d9ef7..46346a14ca 100644
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -3919,7 +3919,7 @@ spa_sync_nvlist(spa_t *spa, uint64_t obj, nvlist_t *nv, dmu_tx_t *tx)
 	 * saves us a pre-read to get data we don't actually care about.
 	 */
 	bufsize = P2ROUNDUP(nvsize, SPA_CONFIG_BLOCKSIZE);
-	packed = kmem_alloc(bufsize, KM_SLEEP);
+	packed = vmem_alloc(bufsize, KM_SLEEP);
 
 	VERIFY(nvlist_pack(nv, &packed, &nvsize, NV_ENCODE_XDR,
 	    KM_SLEEP) == 0);
@@ -3927,7 +3927,7 @@ spa_sync_nvlist(spa_t *spa, uint64_t obj, nvlist_t *nv, dmu_tx_t *tx)
 
 	dmu_write(spa->spa_meta_objset, obj, 0, bufsize, packed, tx);
 
-	kmem_free(packed, bufsize);
+	vmem_free(packed, bufsize);
 
 	VERIFY(0 == dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db));
 	dmu_buf_will_dirty(db, tx);