--- a/usr/src/uts/common/fs/zfs/zfs_znode.c	Mon Nov 26 17:26:09 2007 -0800
+++ b/usr/src/uts/common/fs/zfs/zfs_znode.c	Mon Nov 26 17:57:43 2007 -0800
@@ -293,7 +293,7 @@
 		return (error);
 	} else if (zfsvfs->z_version > ZPL_VERSION) {
 		(void) printf("Mismatched versions:  File system "
-		    "is version %lld on-disk format, which is "
+		    "is version %llu on-disk format, which is "
 		    "incompatible with this software version %lld!",
 		    (u_longlong_t)zfsvfs->z_version, ZPL_VERSION);
 		return (ENOTSUP);
@@ -1231,7 +1231,7 @@
 		char *name;
 
 		ASSERT(nvpair_type(elem) == DATA_TYPE_UINT64);
-		ASSERT(nvpair_value_uint64(elem, &val) == 0);
+		VERIFY(nvpair_value_uint64(elem, &val) == 0);
 		name = nvpair_name(elem);
 		if (strcmp(name, zfs_prop_to_name(ZFS_PROP_VERSION)) == 0) {
 			version = val;