diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index 660845d7..daf8ce94 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -675,6 +675,9 @@ ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count)
 				net__print_ssl_error(mosq);
 				errno = EPROTO;
 			}
+#ifdef WIN32
+			WSASetLastError(errno);
+#endif
 		}
 		return (ssize_t )ret;
 	}else{
diff --git a/src/mosquitto.c b/src/mosquitto.c
index 1829c5e8..a9d0f213 100644
--- a/src/mosquitto.c
+++ b/src/mosquitto.c
@@ -202,6 +202,7 @@ int main(int argc, char *argv[])
 	int rc;
 #ifdef WIN32
 	SYSTEMTIME st;
+	_setmaxstdio(2048);
 #else
 	struct timeval tv;
 #endif