diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 145494788..1f1c6c2ea 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -450,7 +450,8 @@ gboolean window_list_applet_fill(MatePanelApplet* applet)
 
 #ifdef WNCK_CHECK_VERSION
 #if WNCK_CHECK_VERSION (3, 4, 6)
-	wnck_tasklist_set_orientation (tasklist->tasklist, tasklist->orientation);
+	wnck_tasklist_set_orientation (WNCK_TASKLIST (tasklist->tasklist), tasklist->orientation);
+	wnck_tasklist_set_middle_click_close (WNCK_TASKLIST (tasklist->tasklist), TRUE);
 #endif
 #endif
 
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
index c3b659e02..a74e18838 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
@@ -237,7 +237,8 @@ container_child_background_set (GObject      *source_object,
 	mate_panel_applet_container_child_set_finish (container, res, NULL);
 
 	if (frame->priv->bg_cancellable)
-		g_object_unref (frame->priv->bg_cancellable);
+		g_clear_object (&frame->priv->bg_cancellable);
+
 	frame->priv->bg_cancellable = NULL;
 }