diff --git a/kmod/src/forest.c b/kmod/src/forest.c
index 0e5c31d3..306f4841 100644
--- a/kmod/src/forest.c
+++ b/kmod/src/forest.c
@@ -793,7 +793,7 @@ out:
 	if (ret)
 		scoutfs_forest_destroy(sb);
 
-	return 0;
+	return ret;
 }
 
 void scoutfs_forest_start(struct super_block *sb)
diff --git a/kmod/src/ioctl.c b/kmod/src/ioctl.c
index 7a73d4de..ea31321c 100644
--- a/kmod/src/ioctl.c
+++ b/kmod/src/ioctl.c
@@ -415,8 +415,6 @@ static long scoutfs_ioc_data_wait_err(struct file *file, unsigned long arg)
 		return 0;
 	if ((args.op & SCOUTFS_IOC_DWO_UNKNOWN) || !IS_ERR_VALUE(args.err))
 		return -EINVAL;
-	if ((args.op & SCOUTFS_IOC_DWO_UNKNOWN) || !IS_ERR_VALUE(args.err))
-		return -EINVAL;
 
 	trace_scoutfs_ioc_data_wait_err(sb, &args);
 
diff --git a/kmod/src/net.c b/kmod/src/net.c
index 4c22e8ea..8e7cdb4c 100644
--- a/kmod/src/net.c
+++ b/kmod/src/net.c
@@ -336,7 +336,7 @@ static inline u8 net_err_from_host(struct super_block *sb, int error)
 				     error);
 		}
 
-		return -EINVAL;
+		return SCOUTFS_NET_ERR_EINVAL;
 	}
 
 	return net_errs[ind];
diff --git a/kmod/src/quorum.c b/kmod/src/quorum.c
index 242804ed..fc25904e 100644
--- a/kmod/src/quorum.c
+++ b/kmod/src/quorum.c
@@ -1195,8 +1195,8 @@ static struct attribute *quorum_attrs[] = {
 
 static inline bool valid_ipv4_unicast(__be32 addr)
 {
-	return !(ipv4_is_multicast(addr) && ipv4_is_lbcast(addr) &&
-		 ipv4_is_zeronet(addr) && ipv4_is_local_multicast(addr));
+	return !(ipv4_is_multicast(addr) || ipv4_is_lbcast(addr) ||
+		 ipv4_is_zeronet(addr) || ipv4_is_local_multicast(addr));
 }
 
 static inline bool valid_ipv4_port(__be16 port)