diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h
index 01af1e2977..da5c0c9c50 100644
--- a/src/fundamental/macro-fundamental.h
+++ b/src/fundamental/macro-fundamental.h
@@ -173,7 +173,7 @@
 #else
 #  define ABS(a) __builtin_imaxabs(a)
 #endif
-assert_cc(sizeof(intmax_t) <= sizeof(long long));
+assert_cc(sizeof(long long) == sizeof(intmax_t));
 
 #define IS_UNSIGNED_INTEGER_TYPE(type) \
         (__builtin_types_compatible_p(typeof(type), unsigned char) ||   \
diff --git a/src/journal/journald-manager.h b/src/journal/journald-manager.h
index 32412fc6a1..ceaa11801c 100644
--- a/src/journal/journald-manager.h
+++ b/src/journal/journald-manager.h
@@ -115,9 +115,13 @@ typedef struct Manager {
         JournalStorage system_storage;
 
         JournalCompressOptions compress;
+        int set_audit;
         bool seal;
         bool read_kmsg;
-        int set_audit;
+
+        bool send_watchdog;
+        bool sent_notify_ready;
+        bool sync_scheduled;
 
         bool forward_to_kmsg;
         bool forward_to_syslog;
@@ -155,10 +159,6 @@ typedef struct Manager {
         uint64_t *kernel_seqnum;
         RateLimit kmsg_own_ratelimit;
 
-        bool send_watchdog:1;
-        bool sent_notify_ready:1;
-        bool sync_scheduled:1;
-
         char machine_id_field[STRLEN("_MACHINE_ID=") + SD_ID128_STRING_MAX];
         char boot_id_field[STRLEN("_BOOT_ID=") + SD_ID128_STRING_MAX];
         char *hostname_field;
diff --git a/tools/elf2efi.py b/tools/elf2efi.py
index fff2b1a4be..d3ef5907b2 100755
--- a/tools/elf2efi.py
+++ b/tools/elf2efi.py
@@ -611,9 +611,7 @@ def elf2efi(args: argparse.Namespace):
 
     coff.Machine = pe_arch
     coff.NumberOfSections = len(sections)
-    coff.TimeDateStamp = int(
-        os.environ.get("SOURCE_DATE_EPOCH") if os.environ.get("SOURCE_DATE_EPOCH") else time.time()
-    )
+    coff.TimeDateStamp = int(os.environ.get("SOURCE_DATE_EPOCH") or time.time())
     coff.SizeOfOptionalHeader = sizeof(opt)
     # EXECUTABLE_IMAGE|LINE_NUMS_STRIPPED|LOCAL_SYMS_STRIPPED|DEBUG_STRIPPED
     # and (32BIT_MACHINE or LARGE_ADDRESS_AWARE)