diff --git a/cmd/splat.c b/cmd/splat.c
index c0bb7d8d4c..2fa0c50c06 100644
--- a/cmd/splat.c
+++ b/cmd/splat.c
@@ -316,14 +316,15 @@ static test_t *test_find(char *sub_str, char *test_str)
 	ListIterator si, ti;
 	subsystem_t *sub;
 	test_t *test;
-	int sub_num, test_num;
+	__u32 sub_num, test_num;
 
-	/* No error checking here because it may not be a number, it's
+	/*
+	 * No error checking here because it may not be a number, it's
 	 * perfectly OK for it to be a string.  Since we're just using
 	 * it for comparison purposes this is all very safe.
 	 */
-	sub_num = strtol(sub_str, NULL, 0);
-	test_num = strtol(test_str, NULL, 0);
+	sub_num = strtoul(sub_str, NULL, 0);
+	test_num = strtoul(test_str, NULL, 0);
 
         si = list_iterator_create(subsystems);
 
diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
index 9bfead8cf4..dd759bf7fb 100644
--- a/module/spl/spl-vnode.c
+++ b/module/spl/spl-vnode.c
@@ -257,7 +257,8 @@ EXPORT_SYMBOL(vn_seek);
 static struct dentry *
 vn_lookup_hash(struct nameidata *nd)
 {
-	return lookup_one_len(nd->last.name, nd->nd_dentry, nd->last.len);
+	return lookup_one_len((const char *)nd->last.name,
+			      nd->nd_dentry, nd->last.len);
 } /* lookup_hash() */
 
 static void