diff --git a/Makefile b/Makefile
index d2a552d..e7acd02 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg
 # The code for 3 Bytes/Pixel is not very efficient!
 FLAG24 = -DALLOW24BPP
 
-#OPTFLAGS=-g # -Wall
-OPTFLAGS=-O2 -Wall
+OPTFLAGS=-g -Wall
+#OPTFLAGS=-O2 -Wall
 CFLAGS=$(OPTFLAGS) $(PTHREADDEF) $(FLAG24) $(INCLUDES) -DBACKCHANNEL
 RANLIB=ranlib
 
diff --git a/rfbserver.c b/rfbserver.c
index 2190aef..dbbf226 100644
--- a/rfbserver.c
+++ b/rfbserver.c
@@ -42,6 +42,13 @@
 #include <vncserverctrl.h>
 #endif
 
+#ifdef DEBUGPROTO
+#undef DEBUGPROTO
+#define DEBUGPROTO(x) x
+#else
+#define DEBUGPROTO(x)
+#endif
+
 rfbClientPtr pointerClient = NULL;  /* Mutex for pointer events */
 
 static void rfbProcessClientProtocolVersion(rfbClientPtr cl);
diff --git a/sockets.c b/sockets.c
index 7e4a19e..812e4f8 100644
--- a/sockets.c
+++ b/sockets.c
@@ -188,7 +188,7 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec)
     memcpy((char *)&fds, (char *)&(rfbScreen->allFds), sizeof(fd_set));
     tv.tv_sec = 0;
     tv.tv_usec = usec;
-    nfds = select(rfbScreen->maxFd + 1, &fds, NULL, &fds, &tv);
+    nfds = select(rfbScreen->maxFd + 1, &fds, NULL, NULL /* &fds */, &tv);
     if (nfds == 0) {
 	return;
     }
@@ -451,7 +451,7 @@ WriteExact(cl, buf, len)
             FD_SET(sock, &fds);
             tv.tv_sec = 5;
             tv.tv_usec = 0;
-            n = select(sock+1, NULL, &fds, &fds, &tv);
+            n = select(sock+1, NULL, &fds, NULL /* &fds */, &tv);
             if (n < 0) {
                 rfbLogPerror("WriteExact: select");
                 UNLOCK(cl->outputMutex);