diff --git a/src/stream_sock.c b/src/stream_sock.c
index 65a1e379c..e68775a59 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -560,11 +560,11 @@ static int stream_sock_write_loop(struct stream_interface *si, struct buffer *b)
 			int skerr;
 			socklen_t lskerr = sizeof(skerr);
 
-			ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &skerr, &lskerr);
+			ret = getsockopt(si->fd, SOL_SOCKET, SO_ERROR, &skerr, &lskerr);
 			if (ret == -1 || skerr)
 				ret = -1;
 			else
-				ret = send(fd, b->w, max, MSG_DONTWAIT);
+				ret = send(si->fd, b->w, max, MSG_DONTWAIT);
 		}
 #else
 		ret = send(si->fd, b->w, max, MSG_DONTWAIT | MSG_NOSIGNAL);
diff --git a/src/task.c b/src/task.c
index e91a26b1d..6f7b26406 100644
--- a/src/task.c
+++ b/src/task.c
@@ -10,6 +10,8 @@
  *
  */
 
+#include <string.h>
+
 #include <common/config.h>
 #include <common/eb32tree.h>
 #include <common/memory.h>