diff --git a/client.cpp b/client.cpp
index b5fe7f4523..146ff5681b 100644
--- a/client.cpp
+++ b/client.cpp
@@ -134,7 +134,8 @@ WindowWrapper::WindowWrapper( WId w, Client *parent, const char* name)
 
      // install a passive grab to catch mouse button events
      XGrabButton(qt_xdisplay(), AnyButton, AnyModifier, winId(), FALSE,
-		 ButtonPressMask, GrabModeSync, GrabModeAsync,
+		 ButtonPressMask,
+		 GrabModeSync, GrabModeAsync,
 		 None, None );
 }
 
@@ -1175,8 +1176,6 @@ bool Client::eventFilter( QObject *o, QEvent * e)
     if ( o != wwrap )
 	return FALSE;
     switch ( e->type() ) {
-    case QEvent::MouseButtonRelease:
-	break;
     case QEvent::Show:
 	windowWrapperShowEvent( (QShowEvent*)e );
 	break;
diff --git a/main.cpp b/main.cpp
index c8daae066c..915e048fdb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,7 +25,7 @@ Time kwin_time = CurrentTime;
 static bool initting = FALSE;
 int x11ErrorHandler(Display *d, XErrorEvent *e){
     char msg[80], req[80], number[80];
-    bool ignore_badwindow = FALSE; //maybe temporary
+    bool ignore_badwindow = TRUE; //maybe temporary
 
     if (initting &&
 	(