diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
index faafd93bd..3a3027b13 100644
--- a/panels/background/bg-pictures-source.c
+++ b/panels/background/bg-pictures-source.c
@@ -751,13 +751,11 @@ file_added (GFile            *file,
 }
 
 static void
-files_changed_cb (GFileMonitor      *monitor,
+files_changed_cb (BgPicturesSource  *self,
                   GFile             *file,
                   GFile             *other_file,
-                  GFileMonitorEvent  event_type,
-                  gpointer           user_data)
+                  GFileMonitorEvent  event_type)
 {
-  BgPicturesSource *self = BG_PICTURES_SOURCE (user_data);
   g_autofree gchar *uri = NULL;
 
   switch (event_type)
@@ -798,10 +796,10 @@ monitor_path (BgPicturesSource *self,
                                       NULL);
 
   if (monitor)
-    g_signal_connect (monitor,
-                      "changed",
-                      G_CALLBACK (files_changed_cb),
-                      self);
+    g_signal_connect_object (monitor,
+                             "changed",
+                             G_CALLBACK (files_changed_cb),
+                             self, G_CONNECT_SWAPPED);
 
   return monitor;
 }
@@ -840,7 +838,7 @@ bg_pictures_source_init (BgPicturesSource *self)
   self->cache_dir_monitor = monitor_path (self, cache_path);
 
   self->grl_miner = cc_background_grilo_miner_new ();
-  g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+  g_signal_connect_object (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self, G_CONNECT_SWAPPED);
   cc_background_grilo_miner_start (self->grl_miner);
 }
 
diff --git a/panels/background/bg-recent-source.c b/panels/background/bg-recent-source.c
index c21dfc098..11773279e 100644
--- a/panels/background/bg-recent-source.c
+++ b/panels/background/bg-recent-source.c
@@ -171,11 +171,10 @@ query_info_finished_cb (GObject      *source,
 }
 
 static void
-on_file_changed_cb (GFileMonitor      *monitor,
+on_file_changed_cb (BgRecentSource    *self,
                     GFile             *file,
                     GFile             *other_file,
-                    GFileMonitorEvent  event_type,
-                    BgRecentSource    *self)
+                    GFileMonitorEvent  event_type)
 {
   g_autofree gchar *uri = NULL;
 
@@ -322,7 +321,7 @@ load_backgrounds (BgRecentSource *self)
       return;
     }
 
-  g_signal_connect (self->monitor, "changed", G_CALLBACK (on_file_changed_cb), self);
+  g_signal_connect_object (self->monitor, "changed", G_CALLBACK (on_file_changed_cb), self, G_CONNECT_SWAPPED);
 }
 
 /* Callbacks */
diff --git a/panels/background/bg-wallpapers-source.c b/panels/background/bg-wallpapers-source.c
index 3f40650df..7d3b644e5 100644
--- a/panels/background/bg-wallpapers-source.c
+++ b/panels/background/bg-wallpapers-source.c
@@ -62,9 +62,8 @@ list_load_cb (GObject *source_object,
 }
 
 static void
-item_added (CcBackgroundXml    *xml,
-	    CcBackgroundItem   *item,
-	    BgWallpapersSource *self)
+item_added (BgWallpapersSource *self,
+            CcBackgroundItem   *item)
 {
   load_wallpapers (NULL, item, self);
 }
@@ -97,8 +96,8 @@ bg_wallpapers_source_constructed (GObject *object)
 
   G_OBJECT_CLASS (bg_wallpapers_source_parent_class)->constructed (object);
 
-  g_signal_connect (G_OBJECT (self->xml), "added",
-		    G_CALLBACK (item_added), self);
+  g_signal_connect_object (G_OBJECT (self->xml), "added",
+                           G_CALLBACK (item_added), self, G_CONNECT_SWAPPED);
 
   /* Try adding the default background first */
   load_default_bg (self);
diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
index 0eb366d7a..29dedf165 100644
--- a/panels/background/cc-background-panel.c
+++ b/panels/background/cc-background-panel.c
@@ -282,9 +282,7 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass)
 }
 
 static void
-on_settings_changed (GSettings         *settings,
-                     gchar             *key,
-                     CcBackgroundPanel *panel)
+on_settings_changed (CcBackgroundPanel *panel)
 {
   reload_current_bg (panel);
   update_preview (panel);
@@ -312,5 +310,5 @@ cc_background_panel_init (CcBackgroundPanel *panel)
   update_preview (panel);
 
   /* Background settings */
-  g_signal_connect (panel->settings, "changed", G_CALLBACK (on_settings_changed), panel);
+  g_signal_connect_object (panel->settings, "changed", G_CALLBACK (on_settings_changed), panel, G_CONNECT_SWAPPED);
 }