diff --git a/TODO b/TODO
index 31634a9759..072ce83f0a 100644
--- a/TODO
+++ b/TODO
@@ -121,6 +121,9 @@ Deprecations and removals:
 
 Features:
 
+* sd-lldp: pick up 802.3 maximum frame size/mtu, to be able to detect jumbo
+  frame capable networks
+
 * networkd: maintain a file in /run/ that can be symlinked into /run/issue.d/
   that always shows the current primary IP address
 
diff --git a/network/80-auto-link-local.network.example b/network/80-auto-link-local.network.example
index 286b532496..5af0c62782 100644
--- a/network/80-auto-link-local.network.example
+++ b/network/80-auto-link-local.network.example
@@ -18,3 +18,5 @@ Property=ID_NET_AUTO_LINK_LOCAL_ONLY=1
 LinkLocalAddressing=yes
 IPv6AcceptRA=no
 MulticastDNS=yes
+LLDP=yes
+EmitLLDP=yes
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index d3040d03e0..c69f03ec15 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -310,7 +310,6 @@ static int help(int argc, char *argv[], void *userdata) {
                "     --debugger=DEBUGGER     Use the given debugger\n"
                "  -A --debugger-arguments=ARGS\n"
                "                             Pass the given arguments to the debugger\n"
-
                "\nSee the %2$s for details.\n",
                program_invocation_short_name,
                link,
diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index 2deb49557d..65d731a20b 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -331,7 +331,6 @@ static int process_timeout(sd_netlink *nl) {
 
 static int process_reply(sd_netlink *nl, sd_netlink_message *m) {
         struct reply_callback *c;
-        sd_netlink_slot *slot;
         uint32_t serial;
         uint16_t type;
         int r;
@@ -354,7 +353,8 @@ static int process_reply(sd_netlink *nl, sd_netlink_message *m) {
         if (type == NLMSG_DONE)
                 m = NULL;
 
-        slot = container_of(c, sd_netlink_slot, reply_callback);
+        _cleanup_(sd_netlink_slot_unrefp) sd_netlink_slot *slot =
+                sd_netlink_slot_ref(container_of(c, sd_netlink_slot, reply_callback));
 
         r = c->callback(nl, m, slot->userdata);
         if (r < 0)
diff --git a/src/libsystemd/sd-varlink/sd-varlink.c b/src/libsystemd/sd-varlink/sd-varlink.c
index bcb16af89f..3b08577efc 100644
--- a/src/libsystemd/sd-varlink/sd-varlink.c
+++ b/src/libsystemd/sd-varlink/sd-varlink.c
@@ -280,7 +280,7 @@ _public_ int sd_varlink_connect_exec(sd_varlink **ret, const char *_command, cha
                 }
 
                 execvp(command, argv);
-                log_debug_errno(r, "Failed to invoke process '%s': %m", command);
+                log_debug_errno(errno, "Failed to invoke process '%s': %m", command);
                 _exit(EXIT_FAILURE);
         }
 
@@ -4055,8 +4055,10 @@ _public_ int sd_varlink_server_shutdown(sd_varlink_server *s) {
 static void varlink_server_test_exit_on_idle(sd_varlink_server *s) {
         assert(s);
 
-        if (s->exit_on_idle && s->event && s->n_connections == 0)
+        if (s->exit_on_idle && s->event && s->n_connections == 0) {
+                varlink_server_log(s, "Exit-on-idle triggered.");
                 (void) sd_event_exit(s->event, 0);
+        }
 }
 
 _public_ int sd_varlink_server_set_exit_on_idle(sd_varlink_server *s, int b) {