diff --git a/TODO b/TODO
index 223a8cb3e5..c16c9dd5a5 100644
--- a/TODO
+++ b/TODO
@@ -127,6 +127,8 @@ Deprecations and removals:
 
 Features:
 
+* Maybe rename pkcs7 and public verbs of systemd-keyutil to be more verb like.
+
 * sd-boot: do something useful if we find exactly zero entries (ignoring items
   such as reboot/poweroff/factory reset). Show a help text or so.
 
diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c
index 1c94db0516..86fb1a9451 100644
--- a/src/sbsign/sbsign.c
+++ b/src/sbsign/sbsign.c
@@ -558,7 +558,7 @@ static int verb_sign(int argc, char *argv[], void *userdata) {
                 return r;
 
         _cleanup_(PKCS7_freep) PKCS7 *p7 = NULL;
-        PKCS7_SIGNER_INFO *si;
+        PKCS7_SIGNER_INFO *si = NULL; /* avoid false maybe-uninitialized warning */
         r = pkcs7_new_with_attributes(certificate, private_key, signed_attributes, &p7, &si);
         if (r < 0)
                 return r;