diff --git a/src/libsystemd/sd-varlink/varlink-util.c b/src/libsystemd/sd-varlink/varlink-util.c
index 475bec40d8..7b8797c92c 100644
--- a/src/libsystemd/sd-varlink/varlink-util.c
+++ b/src/libsystemd/sd-varlink/varlink-util.c
@@ -335,7 +335,7 @@ ssize_t varlink_execute_directory(
 
                 r = sd_varlink_set_relative_timeout(link, timeout_usec);
                 if (r < 0)
-                        return r;
+                        return log_debug_errno(r, "Failed to set relative timeout: %m");
 
                 if (more)
                         r = sd_varlink_observe(link, method, parameters);
diff --git a/src/notify/notify.c b/src/notify/notify.c
index d3201c66bc..33d8fdf2c0 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -67,7 +67,7 @@ static int help(void) {
         help_cmdline("[OPTIONS...] [VARIABLE=VALUE...]");
         help_cmdline("[OPTIONS...] --exec [VARIABLE=VALUE...] ; -- CMDLINE...");
         help_cmdline("[OPTIONS...] --fork -- CMDLINE...");
-        help_abstract("Notify the init system about service status updates.");
+        help_abstract("Notify the service manager about service status updates.");
 
         help_section("Options:");
         r = table_print_or_warn(options);
@@ -644,7 +644,7 @@ static int run(int argc, char* argv[]) {
         if (r == -E2BIG)
                 return log_error_errno(r, "Too many file descriptors passed.");
         if (r < 0)
-                return log_error_errno(r, "Failed to notify init system: %m");
+                return log_error_errno(r, "Failed to notify service manager: %m");
         if (r == 0)
                 return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
                                        "No status data could be sent: $NOTIFY_SOCKET was not set");
diff --git a/src/shared/help-util.c b/src/shared/help-util.c
index b88da2d259..7e9d3e70be 100644
--- a/src/shared/help-util.c
+++ b/src/shared/help-util.c
@@ -8,8 +8,8 @@
 /* These are helpers for putting together --help texts in a uniform way with a common output style. Each
  * function generates a separate part of the --help text:
  *
- *   1. help_cmdline() outputs a brief summary of the command line syntax. (used at least once, in some cases
- *      multiple times.) This generally comes first in the output.
+ *   1. help_cmdline() outputs a brief summary of the command line syntax. This shall be used at least once,
+ *      in some cases multiple times. This generally comes first in the output.
  *
  *   2. help_abstract() outputs a brief prose abstract of the command, should carry a single line of text
  *      that gives the user a hint what this tool does. Use only once, right after the last help_cmdline().
diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c
index 8cdbfafaa2..72edc033dd 100644
--- a/src/test/test-varlink.c
+++ b/src/test/test-varlink.c
@@ -1009,7 +1009,7 @@ TEST(execute_directory) {
                                      /* timeout_usec= */ USEC_INFINITY,
                                      execute_dir_reply,
                                      &reply_count), (ssize_t) ELEMENTSOF(names));
-        ASSERT_EQ(reply_count, (unsigned) ELEMENTSOF(names));
+        ASSERT_EQ(reply_count, ELEMENTSOF(names));
 
         FOREACH_ELEMENT(eds, servers) {
                 ASSERT_OK(-pthread_join(eds->thread, NULL));