diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 938e5645f9..60305f07f9 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -1988,8 +1988,8 @@ static VOID config_entry_add_linux(
                         path = PoolPrint(L"\\EFI\\Linux\\%s", f->FileName);
 
                         entry = config_entry_add_loader(config, device, LOADER_LINUX, f->FileName, 'l',
-                                                        os_name_pretty ? : (os_name ? : os_id), path,
-                                                        os_version ? : (os_version_id ? : os_build_id));
+                                                        os_name_pretty ?: os_name, path,
+                                                        os_version ?: (os_version_id ? : os_build_id));
 
                         FreePool(content);
                         content = NULL;
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index e9bc19d96a..857193943a 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1516,8 +1516,8 @@ _public_ int sd_bus_open_system_remote(sd_bus **ret, const char *host) {
 }
 
 int bus_set_address_machine(sd_bus *b, bool user, const char *machine) {
+        _cleanup_free_ char *a = NULL;
         const char *rhs;
-        char *a;
 
         assert(b);
         assert(machine);