diff --git a/Makefile b/Makefile
index c72e409..c3a9ae1 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)
 RANLIB=ranlib
 
@@ -58,7 +58,8 @@ OSXvnc-server: mac.o libvncserver.a
 	$(CC) -o OSXvnc-server mac.o $(LIBS) $(OSX_LIBS)
 
 x11vnc: x11vnc.o libvncserver.a
-	$(CC) -o x11vnc x11vnc.o libvncserver.a /usr/lib/libz.a /usr/lib/libjpeg.a $(XLIBS)
+	$(CC) -o x11vnc x11vnc.o libvncserver.a -lz -ljpeg $(XLIBS)
+#	$(CC) -o x11vnc x11vnc.o libvncserver.a /usr/lib/libz.a /usr/lib/libjpeg.a $(XLIBS)
 #$(LIBS) $(XLIBS)
 
 storepasswd: storepasswd.o d3des.o vncauth.o
diff --git a/x11vnc.c b/x11vnc.c
index aaa4d27..12fc32e 100644
--- a/x11vnc.c
+++ b/x11vnc.c
@@ -247,7 +247,9 @@ int main(int argc,char** argv)
     fprintf(stderr,"Couldn't open display!\n");
     exit(2);
   }
-     
+
+  XTestGrabControl(dpy,True);
+
   xscreen = DefaultScreen(dpy);
 
   init_keycodes();
@@ -330,6 +332,7 @@ int main(int argc,char** argv)
     maxMsecsToConnect -= screen->rfbDeferUpdateTime;
     if(maxMsecsToConnect<0) {
       fprintf(stderr,"Maximum time to connect reached. Exiting.\n");
+      XTestDiscard(dpy);
       exit(2);
     }