diff --git a/src/settings.c b/src/settings.c
index 1b9ef9929..d90ca5ac3 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -56,6 +56,8 @@ G_DEFINE_TYPE_WITH_CODE (Settings, settings, XDP_DBUS_TYPE_SETTINGS_SKELETON,
                          G_IMPLEMENT_INTERFACE (XDP_DBUS_TYPE_SETTINGS,
                                                 settings_iface_init));
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (Settings, g_object_unref)
+
 static gboolean
 settings_handle_read_all (XdpDbusSettings       *object,
                           GDBusMethodInvocation *invocation,
@@ -217,7 +219,7 @@ GDBusInterfaceSkeleton *
 settings_create (GDBusConnection *connection,
                  GPtrArray       *implementations)
 {
-  Settings *settings;
+  g_autoptr(Settings) settings = NULL;
   g_autoptr(GError) error = NULL;
   int i;
   int n_impls_tmp;
@@ -255,5 +257,5 @@ settings_create (GDBusConnection *connection,
       return NULL;
     }
 
-  return G_DBUS_INTERFACE_SKELETON (settings);
+  return G_DBUS_INTERFACE_SKELETON (g_steal_pointer (&settings));
 }
diff --git a/src/xdp-app-info-flatpak.c b/src/xdp-app-info-flatpak.c
index 933beec95..0d7ba5149 100644
--- a/src/xdp-app-info-flatpak.c
+++ b/src/xdp-app-info-flatpak.c
@@ -500,7 +500,7 @@ load_bwrap_info (const char  *instance,
   g_autoptr(JsonNode) root = NULL;
   g_autofree char *data = NULL;
   gsize len;
-  char *path;
+  g_autofree char *path = NULL;
 
   g_return_val_if_fail (instance != NULL, 0);