diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 239a19ea..e6477692 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1370,7 +1370,7 @@ thread_main_handle_connection (void *data)
 	      goto exit;
 	    }
 #if WINDOWS
-          if (! MHD_INVALID_PIPE_(deamon->wpipe) )
+          if (! MHD_INVALID_PIPE_(daemon->wpipe) )
             {
               if (! MHD_add_to_fd_set_ (MHD_pipe_get_read_fd_ (daemon->wpipe),
                                         &rs,
@@ -2852,7 +2852,7 @@ MHD_select (struct MHD_Daemon *daemon,
         {
           FD_CLR (daemon->socket_fd,
                   &rs);
-          if (! MHD_add_to_fd_set_ (daemon->wpipe[0],
+          if (! MHD_add_to_fd_set_ (MHD_pipe_get_read_fd_(daemon->wpipe),
                                     &rs,
                                     &maxsock,
                                     FD_SETSIZE))
diff --git a/src/microhttpd/mhd_itc.h b/src/microhttpd/mhd_itc.h
index 3a05c4ec..6d295619 100644
--- a/src/microhttpd/mhd_itc.h
+++ b/src/microhttpd/mhd_itc.h
@@ -244,9 +244,9 @@ struct MHD_Pipe
 /**
  * Close emulated pipe FDs
  */
-#define MHD_pipe_close_(fd) do { \
-   MHD_socket_close_ (pip.fd[0]); \
-   MHD_socket_close_ (pip.fd[1]); \
+#define MHD_pipe_close_(pip) do { \
+   MHD_socket_close_ ((pip).fd[0]); \
+   MHD_socket_close_ ((pip).fd[1]); \
 } while (0)
 
 /**