diff --git a/effects/presentwindows.cpp b/effects/presentwindows.cpp
index 59087eae09..02b28d3566 100644
--- a/effects/presentwindows.cpp
+++ b/effects/presentwindows.cpp
@@ -263,7 +263,7 @@ void PresentWindowsEffect::windowClosed( EffectWindow* w )
     {
     if( mHoverWindow == w )
         mHoverWindow = NULL;
-    mWindowsToPresent.remove( w );
+    mWindowsToPresent.removeAll( w );
     rearrangeWindows();
     }
 
diff --git a/kcmkwin/kwinrules/detectwidget.cpp b/kcmkwin/kwinrules/detectwidget.cpp
index ff9e137ecc..63cf0be13d 100644
--- a/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kcmkwin/kwinrules/detectwidget.cpp
@@ -171,7 +171,7 @@ void DetectDialog::selectWindow()
     // use a dialog, so that all user input is blocked
     // use WX11BypassWM and moving away so that it's not actually visible
     // grab only mouse, so that keyboard can be used e.g. for switching windows
-    grabber = new KDialog( 0, Qt::WX11BypassWM );
+    grabber = new KDialog( 0, Qt::X11BypassWindowManagerHint );
     grabber->move( -1000, -1000 );
     grabber->show();
     grabber->grabMouse( Qt::CrossCursor );
diff --git a/workspace.cpp b/workspace.cpp
index dda03209a5..0ceee9a747 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -441,8 +441,8 @@ Workspace::~Workspace()
         // No removeClient() is called, it does more than just removing.
         // However, remove from some lists to e.g. prevent performTransiencyCheck()
         // from crashing.
-        clients.remove( *it );
-        desktops.remove( *it );
+        clients.removeAll( *it );
+        desktops.removeAll( *it );
         }
     for( UnmanagedList::ConstIterator it = unmanaged.begin();
          it != unmanaged.end();