diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index b3f8eb6518..ac19e5e7de 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -1114,7 +1114,7 @@
     <example>
       <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>
 
-      <programlisting># debootstrap --arch=amd64 unstable ~/debian-tree/
+      <programlisting># debootstrap unstable ~/debian-tree/
 # systemd-nspawn -D ~/debian-tree/</programlisting>
 
       <para>This installs a minimal Debian unstable distribution into
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 900ed369dd..1eedf217fe 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -373,10 +373,8 @@ static int bus_timer_set_transient_property(
                         unit_write_settingf(u, flags|UNIT_ESCAPE_SPECIFIERS, name, "%s=%s", name, str);
 
                         v = new0(TimerValue, 1);
-                        if (!v) {
-                                calendar_spec_free(c);
+                        if (!v)
                                 return -ENOMEM;
-                        }
 
                         v->base = TIMER_CALENDAR;
                         v->calendar_spec = c;
diff --git a/src/core/main.c b/src/core/main.c
index 66c2101b24..3fe4a173fe 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2182,7 +2182,7 @@ static int initialize_security(
 
         dual_timestamp_get(security_start_timestamp);
 
-        r = mac_selinux_setup(loaded_policy) < 0;
+        r = mac_selinux_setup(loaded_policy);
         if (r < 0) {
                 *ret_error_message = "Failed to load SELinux policy";
                 return r;
diff --git a/src/run/run.c b/src/run/run.c
index b018d1547e..0ff8db6b3e 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -120,7 +120,7 @@ static void help(void) {
 }
 
 static int add_timer_property(const char *name, const char *val) {
-        _cleanup_free_ char *p = NULL;
+        char *p;
 
         assert(name);
         assert(val);
@@ -132,8 +132,6 @@ static int add_timer_property(const char *name, const char *val) {
         if (strv_consume(&arg_timer_property, p) < 0)
                 return log_oom();
 
-        p = NULL;
-
         return 0;
 }
 
diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
index f472edcfa1..cc07dc3634 100644
--- a/src/test/test-sizeof.c
+++ b/src/test/test-sizeof.c
@@ -62,6 +62,7 @@ int main(void) {
         info(usec_t);
         info(__time_t);
         info(pid_t);
+        info(uid_t);
         info(gid_t);
 
         info(enum Enum);