diff --git a/plugins/automount/csd-automount-manager.c b/plugins/automount/csd-automount-manager.c
index e31d45c..52240cf 100644
--- a/plugins/automount/csd-automount-manager.c
+++ b/plugins/automount/csd-automount-manager.c
@@ -190,10 +190,8 @@ check_volume_queue (CsdAutomountManager *manager)
                         g_list_remove (manager->priv->volume_queue, volume);
 
                 g_object_unref (volume);
-                l = l->next;
+                l = manager->priv->volume_queue;
         }
-
-        manager->priv->volume_queue = NULL;
 }
 
 static void
diff --git a/plugins/automount/csd-autorun.c b/plugins/automount/csd-autorun.c
index e625c76..5f27b43 100644
--- a/plugins/automount/csd-autorun.c
+++ b/plugins/automount/csd-autorun.c
@@ -798,7 +798,7 @@ autorun_guessed_content_type_callback (GObject *source_object,
 				       gpointer user_data)
 {
 	GError *error;
-	char **guessed_content_type;
+	g_auto(GStrv) guessed_content_type = NULL;
 	AutorunData *data = user_data;
 	gboolean open_folder;
 
@@ -822,7 +822,6 @@ autorun_guessed_content_type_callback (GObject *source_object,
 					open_folder = TRUE;
 				}
 			}
-			g_strfreev (guessed_content_type);
 		} else {
 			if (g_settings_get_boolean (data->settings, "automount-open")) {
 				open_folder = TRUE;