diff --git a/TODO b/TODO
index 9f83a24418..38246f6567 100644
--- a/TODO
+++ b/TODO
@@ -50,7 +50,9 @@ Features:
 
 * add field to transient units that indicate whether systemd or somebody else saves/restores its settings, for integration with libvirt
 
-* wait filter, unify dispatch table in systemctl_main() and friends, convert all to bus_log_create_error()
+* systemctl: rework wait filter to not require match callback
+
+* unify dispatch table in systemctl_main() and friends
 
 * bus: access policy as vtable flag
 
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 31deb674dc..ed66668f79 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -154,15 +154,15 @@ static int set_locale(sd_bus *bus, char **args, unsigned n) {
                         "org.freedesktop.locale1",
                         "SetLocale", &m);
         if (r < 0)
-                return r;
+                return bus_log_create_error(r);
 
         r = sd_bus_message_append_strv(m, args + 1);
         if (r < 0)
-                return r;
+                return bus_log_create_error(r);
 
         r = sd_bus_message_append(m, "b", arg_ask_password);
         if (r < 0)
-                return r;
+                return bus_log_create_error(r);
 
         r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, NULL);
         if (r < 0) {
diff --git a/src/run/run.c b/src/run/run.c
index 3fb72e6103..f4c7005089 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -28,6 +28,7 @@
 #include "build.h"
 #include "unit-name.h"
 #include "path-util.h"
+#include "bus-error.h"
 
 static bool arg_scope = false;
 static bool arg_remain_after_exit = false;