diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 3b6d70ee..2ffd4cc6 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -1464,7 +1464,6 @@ QPDF::fixDanglingReferences(bool force)
                 queue.push_back(sub);
             }
         }
-
     }
 }
 
diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index 15999436..ba19cbb9 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -2370,7 +2370,7 @@ QPDFWriter::generateObjectStreams()
 
     // This code doesn't do anything with /Extends.
 
-    std::vector<QPDFObjGen> const& eligible =
+    std::vector<QPDFObjGen> eligible =
         QPDF::Writer::getCompressibleObjGens(this->m->pdf);
     size_t n_object_streams = (eligible.size() + 99U) / 100U;
     if (n_object_streams == 0)
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index 4bb00561..86cd6ad7 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -5730,7 +5730,7 @@ int realmain(int argc, char* argv[])
             {
                 // Allow --is-encrypted and --requires-password to
                 // work when an incorrect password is supplied.
-                exit(0);
+                return 0;
             }
             throw e;
         }
@@ -5739,22 +5739,22 @@ int realmain(int argc, char* argv[])
         {
             if (pdf.isEncrypted())
             {
-                exit(0);
+                return 0;
             }
             else
             {
-                exit(EXIT_IS_NOT_ENCRYPTED);
+                return EXIT_IS_NOT_ENCRYPTED;
             }
         }
         else if (o.check_requires_password)
         {
             if (pdf.isEncrypted())
             {
-                exit(EXIT_CORRECT_PASSWORD);
+                return EXIT_CORRECT_PASSWORD;
             }
             else
             {
-                exit(EXIT_IS_NOT_ENCRYPTED);
+                return EXIT_IS_NOT_ENCRYPTED;
             }
         }
         if (! o.page_specs.empty())
@@ -5788,14 +5788,14 @@ int realmain(int argc, char* argv[])
                           << " resulting file may have some problems"
                           << std::endl;
             }
-            // Still exit with warning code even if warnings were suppressed.
-            exit(EXIT_WARNING);
+            // Still return with warning code even if warnings were suppressed.
+            return EXIT_WARNING;
 	}
     }
     catch (std::exception& e)
     {
 	std::cerr << e.what() << std::endl;
-	exit(EXIT_ERROR);
+	return EXIT_ERROR;
     }
 
     return 0;