diff --git a/src/app/rpmostree-builtin-status.c b/src/app/rpmostree-builtin-status.c
index 6f1df478..44bcff01 100644
--- a/src/app/rpmostree-builtin-status.c
+++ b/src/app/rpmostree-builtin-status.c
@@ -135,7 +135,7 @@ status_generic (RPMOSTreeSysroot *sysroot_proxy,
       g_assert (g_variant_dict_lookup (dict, "osname", "&s", &os_name));
       g_assert (g_variant_dict_lookup (dict, "id", "&s", &id));
       g_assert (g_variant_dict_lookup (dict, "serial", "i", &serial));
-      g_assert (g_variant_dict_lookup (dict, "checksum", "s", &checksum));
+      g_assert (g_variant_dict_lookup (dict, "checksum", "&s", &checksum));
       g_assert (g_variant_dict_lookup (dict, "timestamp", "t", &t));
       { g_autoptr(GDateTime) timestamp = g_date_time_new_from_unix_utc (t);
 
@@ -145,7 +145,7 @@ status_generic (RPMOSTreeSysroot *sysroot_proxy,
           timestamp_string = g_strdup_printf ("(invalid timestamp)");
       }
       
-      if (g_variant_dict_lookup (dict, "origin", "s", &origin_refspec))
+      if (g_variant_dict_lookup (dict, "origin", "&s", &origin_refspec))
         {
           if (g_variant_dict_lookup (dict, "packages", "^a&s", &origin_packages))
             {
diff --git a/src/daemon/rpmostreed-deployment-utils.c b/src/daemon/rpmostreed-deployment-utils.c
index de5fa706..8e6e8d7a 100644
--- a/src/daemon/rpmostreed-deployment-utils.c
+++ b/src/daemon/rpmostreed-deployment-utils.c
@@ -75,7 +75,7 @@ rpmostreed_deployment_gpg_results (OstreeRepo *repo,
 
   guint n_sigs, i;
   gboolean gpg_verify;
-  GVariantBuilder builder;
+  g_auto(GVariantBuilder) builder;
 
   g_variant_builder_init (&builder, G_VARIANT_TYPE ("av"));
 
diff --git a/src/libpriv/rpmostree-core.c b/src/libpriv/rpmostree-core.c
index a6352924..5c70776f 100644
--- a/src/libpriv/rpmostree-core.c
+++ b/src/libpriv/rpmostree-core.c
@@ -572,8 +572,8 @@ rpmostree_context_setup (RpmOstreeContext    *self,
 {
   gboolean ret = FALSE;
   GPtrArray *repos = NULL;
-  char **enabled_repos = NULL;
-  char **instlangs = NULL;
+  g_autofree char **enabled_repos = NULL;
+  g_autofree char **instlangs = NULL;
 
   self->spec = g_object_ref (spec);
 
@@ -962,7 +962,7 @@ rpmostree_context_prepare_install (RpmOstreeContext    *self,
 {
   gboolean ret = FALSE;
   DnfContext *hifctx = self->hifctx;
-  char **pkgnames = NULL;
+  g_autofree char **pkgnames = NULL;
   g_autoptr(RpmOstreeInstall) ret_install = g_object_new (RPMOSTREE_TYPE_INSTALL, NULL);
 
   g_assert (g_variant_dict_lookup (self->spec->dict, "packages", "^a&s", &pkgnames));