diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c
index b356fbed70..51c96ff0e0 100644
--- a/src/esx/esx_stream.c
+++ b/src/esx/esx_stream.c
@@ -287,7 +287,7 @@ esxStreamRecvFlags(virStreamPtr stream,
             if (esxStreamTransfer(priv, false) < 0)
                 return -1;
 
-            if (priv->buffer_used <= 0)
+            if (priv->buffer_used == 0)
                 return -2;
         } else /* blocking */ {
             do {
diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c
index 3cd8c8f745..5020b5dc1b 100644
--- a/src/libvirt-qemu.c
+++ b/src/libvirt-qemu.c
@@ -233,7 +233,7 @@ virDomainQemuAttach(virConnectPtr conn,
     virResetLastError();
 
     virCheckConnectReturn(conn, NULL);
-    virCheckPositiveArgGoto(pid_value, error);
+    virCheckNonZeroArgGoto(pid_value, error);
     if (pid != pid_value) {
         virReportInvalidArg(pid_value,
                             _("pid_value in %s is too large"),