diff --git a/src/server.c b/src/server.c
index 0091ec17..bbaa3330 100644
--- a/src/server.c
+++ b/src/server.c
@@ -89,9 +89,7 @@ static void close_and_free_server(EV_P_ struct server *server);
 
 int verbose = 0;
 int udprelay = 0;
-#ifdef TCP_FASTOPEN
 static int fast_open = 0;
-#endif
 #ifdef HAVE_SETRLIMIT
 static int nofile = 0;
 #endif
diff --git a/src/udprelay.c b/src/udprelay.c
index 0b9f4d72..84bc39e9 100644
--- a/src/udprelay.c
+++ b/src/udprelay.c
@@ -292,7 +292,7 @@ int create_server_socket(const char *host, const char *port)
         int opt = 1;
         setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
 #ifdef SO_NOSIGPIPE
-        set_nosigpipe(remotefd);
+        set_nosigpipe(server_sock);
 #endif
 
         s = bind(server_sock, rp->ai_addr, rp->ai_addrlen);