diff --git a/src/core/manager.c b/src/core/manager.c
index d7dbf6c8a97..3150740e05a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4453,7 +4453,7 @@ static void manager_deserialize_uid_refs_one_internal(
 
         r = hashmap_replace(*uid_refs, UID_TO_PTR(uid), UINT32_TO_PTR(c));
         if (r < 0) {
-                log_debug("Failed to add UID reference entry");
+                log_debug_errno(r, "Failed to add UID reference entry: %m");
                 return;
         }
 }
diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index 800d31cebe1..a9497fe5872 100644
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -174,6 +174,8 @@ int main(int argc, char *argv[]) {
 
 finish:
         arg_default_unit = mfree(arg_default_unit);
+        strv_free(arg_wants);
+        strv_free(arg_mask);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
index 036493a3898..bfee2fde313 100644
--- a/src/hibernate-resume/hibernate-resume-generator.c
+++ b/src/hibernate-resume/hibernate-resume-generator.c
@@ -95,10 +95,13 @@ int main(int argc, char *argv[]) {
 
         if (arg_noresume) {
                 log_notice("Found \"noresume\" on the kernel command line, quitting.");
-                return EXIT_SUCCESS;
+                r = 0;
+                goto finish;
         }
 
         r = process_resume();
+
+finish:
         free(arg_resume_device);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;