diff --git a/activation.cpp b/activation.cpp
index 1f96e6ca4c..9a06b6508b 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -642,7 +642,7 @@ void Workspace::restoreFocus()
         requestFocus(last_active_client);
 }
 
-void Workspace::clientAttentionChanged(Client* c, bool set)
+void Workspace::clientAttentionChanged(AbstractClient* c, bool set)
 {
     if (set) {
         attention_chain.removeAll(c);
diff --git a/scripting/workspace_wrapper.cpp b/scripting/workspace_wrapper.cpp
index 7c6b943439..f041dcc294 100644
--- a/scripting/workspace_wrapper.cpp
+++ b/scripting/workspace_wrapper.cpp
@@ -46,7 +46,7 @@ WorkspaceWrapper::WorkspaceWrapper(QObject* parent) : QObject(parent)
     connect(ws, &Workspace::clientActivated, this, &WorkspaceWrapper::clientActivated);
     connect(vds, SIGNAL(countChanged(uint,uint)), SIGNAL(numberDesktopsChanged(uint)));
     connect(vds, SIGNAL(layoutChanged(int,int)), SIGNAL(desktopLayoutChanged()));
-    connect(ws, SIGNAL(clientDemandsAttentionChanged(KWin::Client*,bool)), SIGNAL(clientDemandsAttentionChanged(KWin::Client*,bool)));
+    connect(ws, &Workspace::clientDemandsAttentionChanged, this, &WorkspaceWrapper::clientDemandsAttentionChanged);
 #ifdef KWIN_BUILD_ACTIVITIES
     KWin::Activities *activities = KWin::Activities::self();
     connect(activities, SIGNAL(currentChanged(QString)), SIGNAL(currentActivityChanged(QString)));
diff --git a/scripting/workspace_wrapper.h b/scripting/workspace_wrapper.h
index 2f86a772d5..327866ac6d 100644
--- a/scripting/workspace_wrapper.h
+++ b/scripting/workspace_wrapper.h
@@ -118,7 +118,7 @@ Q_SIGNALS:
      * @param c The Client for which demands attention changed
      * @param set New value of demands attention
      **/
-    void clientDemandsAttentionChanged(KWin::Client *client, bool set);
+    void clientDemandsAttentionChanged(KWin::AbstractClient *client, bool set);
     /**
      * Signal emitted when the number of screens changes.
      * @param count The new number of screens
diff --git a/workspace.h b/workspace.h
index 5ef8dfa57b..3a36c97a2c 100644
--- a/workspace.h
+++ b/workspace.h
@@ -188,7 +188,7 @@ public:
     void forceRestacking();
 
     void clientHidden(Client*);
-    void clientAttentionChanged(Client* c, bool set);
+    void clientAttentionChanged(AbstractClient* c, bool set);
 
     /**
      * @return List of clients currently managed by Workspace
@@ -446,7 +446,7 @@ Q_SIGNALS:
     void clientAdded(KWin::Client*);
     void clientRemoved(KWin::Client*);
     void clientActivated(KWin::AbstractClient*);
-    void clientDemandsAttentionChanged(KWin::Client*, bool);
+    void clientDemandsAttentionChanged(KWin::AbstractClient*, bool);
     void groupAdded(KWin::Group*);
     void unmanagedAdded(KWin::Unmanaged*);
     void unmanagedRemoved(KWin::Unmanaged*);
@@ -534,7 +534,7 @@ private:
     mutable ToplevelList x_stacking; // From XQueryTree()
     mutable bool x_stacking_dirty;
     QList<AbstractClient*> should_get_focus; // Last is most recent
-    ClientList attention_chain;
+    QList<AbstractClient*> attention_chain;
 
     bool showing_desktop;