diff --git a/examples/sftpclient/sftpclient.c b/examples/sftpclient/sftpclient.c
index be4a3687b..d87cb4e35 100644
--- a/examples/sftpclient/sftpclient.c
+++ b/examples/sftpclient/sftpclient.c
@@ -591,7 +591,8 @@ static int doCmds(func_args* args)
                     ret = wolfSSH_get_error(ssh);
                 }
             } while (ret == WS_WANT_READ || ret == WS_WANT_WRITE ||
-                    ret == WS_CHAN_RXD || ret == WS_REKEYING);
+                    ret == WS_CHAN_RXD || ret == WS_REKEYING ||
+                    ret == WS_WINDOW_FULL);
 
 #ifndef WOLFSSH_NO_TIMESTAMP
             WMEMSET(currentFile, 0, WOLFSSH_MAX_FILENAME);
@@ -702,7 +703,8 @@ static int doCmds(func_args* args)
                     ret = wolfSSH_get_error(ssh);
                 }
             } while (ret == WS_WANT_READ || ret == WS_WANT_WRITE ||
-                    ret == WS_CHAN_RXD || ret == WS_REKEYING);
+                    ret == WS_CHAN_RXD || ret == WS_REKEYING ||
+                    ret == WS_WINDOW_FULL);
 
 #ifndef WOLFSSH_NO_TIMESTAMP
             WMEMSET(currentFile, 0, WOLFSSH_MAX_FILENAME);
@@ -1058,7 +1060,8 @@ static int doCmds(func_args* args)
                     ret = wolfSSH_get_error(ssh);
                 }
             } while (ret == WS_WANT_READ || ret == WS_WANT_WRITE ||
-                    ret == WS_CHAN_RXD || ret == WS_REKEYING);
+                    ret == WS_CHAN_RXD || ret == WS_REKEYING ||
+                    ret == WS_WINDOW_FULL);
             if (ret != WS_SUCCESS) {
                 if (SFTP_FPUTS(args, "Error with rename\n") < 0) {
                     err_msg("fputs error");
diff --git a/src/internal.c b/src/internal.c
index e40878584..996484832 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -17483,7 +17483,7 @@ int wolfSSH_oct2dec(WOLFSSH* ssh, byte* oct, word32 octSz)
 }
 
 #ifndef WOLFSSL_MAX_32BIT
-    #define WOLFSSL_MAX_32BIT INT_MAX
+    #define WOLFSSL_MAX_32BIT 0xffffffffU  /* wolfSSL types.h defines this */
 #endif
 
 /* addend1 += addend2 */
@@ -17493,7 +17493,7 @@ void AddAssign64(word32* addend1, word32 addend2)
         addend1[1]++;
 
         /* -1 to account for roll over digit */
-        addend1[0] = addend2 - (WOLFSSL_MAX_32BIT- addend1[0]) - 1;
+        addend1[0] = addend2 - (WOLFSSL_MAX_32BIT - addend1[0]) - 1;
     }
     else {
         addend1[0] += addend2;