diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 6de905b69c1..587d9b5f9e1 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -354,7 +354,8 @@ static int bus_service_set_transient_property(
         if (streq(name, "SuccessExitStatus"))
                 return bus_set_transient_exit_status(u, name, &s->success_status, message, flags, error);
 
-        if ((ci = service_exec_command_from_string(name)) >= 0)
+        ci = service_exec_command_from_string(name);
+        if (ci >= 0)
                 return bus_set_transient_exec_command(u, name, &s->exec_command[ci], message, flags, error);
 
         if (streq(name, "StandardInputFileDescriptor"))
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index a1b8b85e105..b0a00cda378 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -1072,8 +1072,7 @@ int main(int argc, char *argv[]) {
 end:
         pager_close();
 
-        if (arg_output)
-                fclose(arg_output);
+        safe_fclose(arg_output);
 
         return r >= 0 ? r : EXIT_FAILURE;
 }
diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 3b9917b4a8c..f90b7e43755 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -200,7 +200,7 @@ static bool check_compressed(uint64_t compress_threshold, uint64_t data_size) {
         /* We have to partially reimplement some of the dump logic, because the normal next_entry does the
          * decompression for us. */
         p = le64toh(f->header->header_size);
-        while (true) {
+        for (;;) {
                 r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o);
                 assert_se(r == 0);
                 if (o->object.type == OBJECT_DATA)