diff --git a/autogen.sh b/autogen.sh
index 3dc2b94b..b8460d62 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,7 @@ else
 fi
 
 cd $olddir
-if ! test -f libglnx/README.md -o bsdiff/README.md; then
+if ! test -f libglnx/README.md || ! test -f bsdiff/README.md; then
     git submodule update --init
 fi
 # Workaround automake bug with subdir-objects and computed paths
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 3aa72700..91b345e3 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1153,7 +1153,7 @@ rename_pending_loose_objects (OstreeRepo        *self,
           loose_objpath[1] = dent->d_name[1];
           loose_objpath[2] = '/';
 
-          strncpy (loose_objpath + 3, child_dent->d_name, sizeof (loose_objpath)-3);
+          g_strlcpy (loose_objpath + 3, child_dent->d_name, sizeof (loose_objpath)-3);
 
           if (!_ostree_repo_ensure_loose_objdir_at (self->objects_dir_fd, loose_objpath,
                                                     cancellable, error))
diff --git a/src/libostree/ostree-repo-static-delta-compilation-analysis.c b/src/libostree/ostree-repo-static-delta-compilation-analysis.c
index 923115fc..9f646562 100644
--- a/src/libostree/ostree-repo-static-delta-compilation-analysis.c
+++ b/src/libostree/ostree-repo-static-delta-compilation-analysis.c
@@ -302,4 +302,3 @@ _ostree_delta_compute_similar_objects (OstreeRepo                 *repo,
  out:
   return ret;
 }
-
diff --git a/src/ostree/ot-builtin-gpg-sign.c b/src/ostree/ot-builtin-gpg-sign.c
index 74354d03..cc298434 100644
--- a/src/ostree/ot-builtin-gpg-sign.c
+++ b/src/ostree/ot-builtin-gpg-sign.c
@@ -91,4 +91,3 @@ out:
 
   return ret;
 }
-