diff --git a/dump1090.c b/dump1090.c
index 257f8a6..d93cddb 100644
--- a/dump1090.c
+++ b/dump1090.c
@@ -838,7 +838,13 @@ int main(int argc, char **argv) {
     } else {
         if (Modes.filename[0] == '-' && Modes.filename[1] == '\0') {
             Modes.fd = STDIN_FILENO;
-        } else if ((Modes.fd = open(Modes.filename, (O_RDONLY | O_BINARY))) == -1) {
+        } else if ((Modes.fd = open(Modes.filename,
+#ifdef _WIN32
+                                    (O_RDONLY | O_BINARY)
+#else
+                                    (O_RDONLY)
+#endif
+                                    )) == -1) {
             perror("Opening data file");
             exit(1);
         }
diff --git a/net_io.c b/net_io.c
index 2b0ed9a..4afeb23 100644
--- a/net_io.c
+++ b/net_io.c
@@ -88,7 +88,7 @@ void modesInitNet(void) {
 			int s = anetTcpServer(Modes.aneterr, services[j].port, NULL);
 			if (s == -1) {
 				fprintf(stderr, "Error opening the listening port %d (%s): %s\n",
-					services[j].port, services[j].descr, strerror(errno));
+					services[j].port, services[j].descr, Modes.aneterr);
 				exit(1);
 			}
 			anetNonBlock(Modes.aneterr, s);
@@ -851,11 +851,12 @@ void modesReadFromClient(struct client *c, char *sep,
             bContinue = 0;
         }
 #ifndef _WIN32
-        if ( (nread < 0) && (errno != EAGAIN)) { // Error, or end of file
+        if ( (nread < 0 && errno != EAGAIN && errno != EWOULDBLOCK) || nread == 0 ) { // Error, or end of file
 #else
         if ( (nread < 0) && (errno != EWOULDBLOCK)) { // Error, or end of file
 #endif
             modesFreeClient(c);
+            return;
         }
         if (nread <= 0) {
             break; // Serve next client