diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 6a5ba9dd..5d28dca8 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1534,7 +1534,7 @@ ostree_repo_commit_transaction (OstreeRepo                  *self,
   if (g_getenv ("OSTREE_SUPPRESS_SYNCFS") == NULL)
     {
       if (syncfs (self->tmp_dir_fd) < 0)
-        return glnx_throw_errno (error);
+        return glnx_throw_errno_prefix (error, "syncfs");
     }
 
   if (!rename_pending_loose_objects (self, cancellable, error))
@@ -2798,8 +2798,8 @@ write_dfd_iter_to_mtree_internal (OstreeRepo                  *self,
   OstreeRepoCommitFilterResult filter_result;
   struct stat dir_stbuf;
 
-  if (fstat (src_dfd_iter->fd, &dir_stbuf) != 0)
-    return glnx_throw_errno (error);
+  if (!glnx_fstat (src_dfd_iter->fd, &dir_stbuf, error))
+    return FALSE;
 
   child_info = _ostree_stbuf_to_gfileinfo (&dir_stbuf);
 
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 7ad2019e..6971d9b4 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1129,8 +1129,8 @@ impl_repo_remote_delete (OstreeRepo     *self,
 
   if (remote->file != NULL)
     {
-      if (unlink (gs_file_get_path_cached (remote->file)) != 0)
-        return glnx_throw_errno (error);
+      if (!glnx_unlinkat (AT_FDCWD, gs_file_get_path_cached (remote->file), 0, error))
+        return FALSE;
     }
   else
     {
@@ -2362,8 +2362,8 @@ ostree_repo_open (OstreeRepo    *self,
       /* Note - we don't return this error yet! */
     }
 
-  if (fstat (self->objects_dir_fd, &stbuf) != 0)
-    return glnx_throw_errno (error);
+  if (!glnx_fstat (self->objects_dir_fd, &stbuf, error))
+    return FALSE;
   self->owner_uid = stbuf.st_uid;
 
   if (stbuf.st_uid != getuid () || stbuf.st_gid != getgid ())
@@ -2749,8 +2749,8 @@ load_metadata_internal (OstreeRepo       *self,
 
   if (fd != -1)
     {
-      if (fstat (fd, &stbuf) < 0)
-        return glnx_throw_errno (error);
+      if (!glnx_fstat (fd, &stbuf, error))
+        return FALSE;
 
       if (out_variant)
         {
@@ -3173,7 +3173,7 @@ _ostree_repo_has_loose_object (OstreeRepo           *self,
           if (errno == ENOENT)
             ; /* Next dfd */
           else
-            return glnx_throw_errno (error);
+            return glnx_throw_errno_prefix (error, "fstatat(%s)", loose_path_buf);
         }
       else
         {
@@ -3696,7 +3696,7 @@ ostree_repo_load_commit (OstreeRepo            *self,
         }
       else if (errno != ENOENT)
         {
-          return glnx_throw_errno (error);
+          return glnx_throw_errno_prefix (error, "fstatat(%s)", commitpartial_path);
         }
     }
 
diff --git a/src/libostree/ostree-sepolicy.c b/src/libostree/ostree-sepolicy.c
index 6012d9da..64670092 100644
--- a/src/libostree/ostree-sepolicy.c
+++ b/src/libostree/ostree-sepolicy.c
@@ -521,7 +521,7 @@ ostree_sepolicy_get_label (OstreeSePolicy    *self,
       if (errno == ENOENT)
         *out_label = NULL;
       else
-        return glnx_throw_errno (error);
+        return glnx_throw_errno_prefix (error, "selabel_lookup");
     }
   else
     {
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index f50f2457..62ebd6b6 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -171,8 +171,8 @@ copy_dir_recurse (int              src_parent_dfd,
     return FALSE;
 
   /* Create with mode 0700, we'll fchmod/fchown later */
-  if (mkdirat (dest_parent_dfd, name, 0700) != 0)
-    return glnx_throw_errno (error);
+  if (!glnx_ensure_dir (dest_parent_dfd, name, 0700, error))
+    return FALSE;
 
   if (!glnx_opendirat (dest_parent_dfd, name, TRUE, &dest_dfd, error))
     return FALSE;
diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index 8e6c475c..e8e299fe 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -471,8 +471,8 @@ _ostree_sysroot_read_boot_loader_configs (OstreeSysroot *self,
       if (dent == NULL)
         break;
 
-      if (fstatat (dfd_iter.fd, dent->d_name, &stbuf, 0) != 0)
-        return glnx_throw_errno (error);
+      if (!glnx_fstatat (dfd_iter.fd, dent->d_name, &stbuf, 0, error))
+        return FALSE;
 
       if (g_str_has_prefix (dent->d_name, "ostree-") &&
           g_str_has_suffix (dent->d_name, ".conf") &&