diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04d057755c..e2362abaff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ include_directories(
 
 add_subdirectory( lib ) 
 add_subdirectory( killer )
-add_subdirectory( kcmkwin )
+#add_subdirectory( kcmkwin )
 add_subdirectory( clients )
 add_subdirectory( data )
 
diff --git a/client.cpp b/client.cpp
index b815f1bf84..1a2b0cec0e 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1579,8 +1579,7 @@ void Client::setOnAllActivities( bool b )
         activityList.clear();
         //FIXME update transients
     } else {
-        KActivityConsumer c;
-        setOnActivity(c.currentActivity(), true);
+        setOnActivity(Workspace::self()->currentActivity(), true);
         //FIXME update transients
         return;
     }
diff --git a/workspace.cpp b/workspace.cpp
index fb6a0d6691..d0d83d955a 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1780,7 +1780,7 @@ void Workspace::toggleClientOnActivity( Client* c, const QString &activity, bool
     if( c->isOnActivity(activity) == was_on_activity && c->isOnAllActivities() == was_on_all ) // No change
         return;
 
-    if( c->isOnActivity( activityController_.currentActivity() ))
+    if( c->isOnCurrentActivity() )
         {
         if( c->wantsTabFocus() && options->focusPolicyIsReasonable() &&
             !was_on_activity && // for stickyness changes