diff --git a/src/libtomahawk/albumplaylistinterface.cpp b/src/libtomahawk/albumplaylistinterface.cpp
index 791aecafd..a929d09c6 100644
--- a/src/libtomahawk/albumplaylistinterface.cpp
+++ b/src/libtomahawk/albumplaylistinterface.cpp
@@ -92,7 +92,7 @@ AlbumPlaylistInterface::tracks()
         cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
 
         connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
-                        SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
+                        m_album.data(), SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
 
         Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
     }
diff --git a/src/libtomahawk/albumplaylistinterface.h b/src/libtomahawk/albumplaylistinterface.h
index 486a0871a..3cc11a387 100644
--- a/src/libtomahawk/albumplaylistinterface.h
+++ b/src/libtomahawk/albumplaylistinterface.h
@@ -59,7 +59,7 @@ public:
     virtual void addQueries( const QList<Tomahawk::query_ptr>& tracks );
 
 signals:
-    void repeatModeChanged( PlaylistInterface::RepeatMode mode );
+    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
     void shuffleModeChanged( bool enabled );
 
     void trackCountChanged( unsigned int tracks );
diff --git a/src/libtomahawk/artistplaylistinterface.h b/src/libtomahawk/artistplaylistinterface.h
index 65f81f7ff..4f178f69c 100644
--- a/src/libtomahawk/artistplaylistinterface.h
+++ b/src/libtomahawk/artistplaylistinterface.h
@@ -58,15 +58,6 @@ public:
 
     virtual void addQueries( const QList<Tomahawk::query_ptr>& tracks );
 
-signals:
-    void repeatModeChanged( PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
-
-    void nextTrackReady();
-
 private:
     Q_DISABLE_COPY( ArtistPlaylistInterface )
 
diff --git a/src/libtomahawk/playlist/albumproxymodelplaylistinterface.h b/src/libtomahawk/playlist/albumproxymodelplaylistinterface.h
index 01e34cdc4..16db3cb7c 100644
--- a/src/libtomahawk/playlist/albumproxymodelplaylistinterface.h
+++ b/src/libtomahawk/playlist/albumproxymodelplaylistinterface.h
@@ -63,7 +63,7 @@ signals:
     void nextTrackReady();
 
 public slots:
-    virtual void setRepeatMode( RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
+    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
     virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); }
 
 private:
diff --git a/src/libtomahawk/playlist/trackproxymodelplaylistinterface.h b/src/libtomahawk/playlist/trackproxymodelplaylistinterface.h
index afd5bdfb0..94d85556d 100644
--- a/src/libtomahawk/playlist/trackproxymodelplaylistinterface.h
+++ b/src/libtomahawk/playlist/trackproxymodelplaylistinterface.h
@@ -55,7 +55,7 @@ public:
     virtual bool shuffled() const { return m_shuffled; }
 
 public slots:
-    virtual void setRepeatMode( RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
+    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
     virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); }
 
 protected:
diff --git a/src/libtomahawk/playlist/treeproxymodelplaylistinterface.h b/src/libtomahawk/playlist/treeproxymodelplaylistinterface.h
index f38654981..4f6134f44 100644
--- a/src/libtomahawk/playlist/treeproxymodelplaylistinterface.h
+++ b/src/libtomahawk/playlist/treeproxymodelplaylistinterface.h
@@ -74,7 +74,7 @@ signals:
     void nextTrackReady();
 
 public slots:
-    virtual void setRepeatMode( RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
+    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
     virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); }
 
 private:
diff --git a/src/libtomahawk/playlistinterface.h b/src/libtomahawk/playlistinterface.h
index 1632e5b66..b125d8ae9 100644
--- a/src/libtomahawk/playlistinterface.h
+++ b/src/libtomahawk/playlistinterface.h
@@ -78,7 +78,7 @@ public slots:
     virtual void setShuffled( bool enabled ) = 0;
 
 signals:
-    void repeatModeChanged( PlaylistInterface::RepeatMode mode );
+    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
     void shuffleModeChanged( bool enabled );
     void trackCountChanged( unsigned int tracks );
     void sourceTrackCountChanged( unsigned int tracks );
diff --git a/src/libtomahawk/playlistplaylistinterface.h b/src/libtomahawk/playlistplaylistinterface.h
index 94dcacd08..7de2dcef8 100644
--- a/src/libtomahawk/playlistplaylistinterface.h
+++ b/src/libtomahawk/playlistplaylistinterface.h
@@ -56,15 +56,6 @@ public:
 
     virtual void setFilter( const QString& /*pattern*/ ) {}
 
-signals:
-    void repeatModeChanged( PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
-
-    void nextTrackReady();
-
 public slots:
     virtual void setRepeatMode( PlaylistInterface::RepeatMode ) {}
     virtual void setShuffled( bool ) {}
diff --git a/src/libtomahawk/sourceplaylistinterface.h b/src/libtomahawk/sourceplaylistinterface.h
index ce03f3c63..82de8ad44 100644
--- a/src/libtomahawk/sourceplaylistinterface.h
+++ b/src/libtomahawk/sourceplaylistinterface.h
@@ -65,13 +65,6 @@ public slots:
     virtual void setRepeatMode( PlaylistInterface::RepeatMode ) {}
     virtual void setShuffled( bool ) {}
 
-signals:
-    void repeatModeChanged( PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
-    void nextTrackReady();
-
 private slots:
     void onSourcePlaybackStarted( const Tomahawk::query_ptr& query );
     void resolvingFinished( bool hasResults );