diff --git a/src/config_file.c b/src/config_file.c
index 8f2a89ec9..f1aa26b58 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -183,7 +183,7 @@ gboolean load_config(const gchar *filename, RaucConfig **config, GError **error)
 						error,
 						R_CONFIG_ERROR,
 						R_CONFIG_ERROR_INVALID_FORMAT,
-						"Invalid slot name format");
+						"Invalid slot name format: %s", groups[i]);
 				res = FALSE;
 				goto free;
 			}
diff --git a/src/main.c b/src/main.c
index 5c879c33f..ab013dc27 100644
--- a/src/main.c
+++ b/src/main.c
@@ -168,7 +168,7 @@ static gboolean install_start(int argc, char **argv)
 			g_printerr("Failed to connect completed signal\n");
 			goto out_loop;
 		}
-		g_print("Trying to contact rauc service\n");
+		g_debug("Trying to contact rauc service");
 		if (!r_installer_call_install_sync(installer, bundlelocation, NULL,
 						   &error)) {
 			g_printerr("Failed %s\n", error->message);
@@ -945,7 +945,7 @@ static gboolean status_start(int argc, char **argv)
 			r_exit_status = 1;
 			goto out;
 		}
-		g_print("trying to contact rauc service\n");
+		g_debug("Trying to contact rauc service");
 		if (!r_installer_call_mark_sync(proxy, state, slot_identifier,
 						&slot_name, &message, NULL, &ierror)) {
 			message = g_strdup(ierror->message);
@@ -1036,7 +1036,7 @@ static void cmdline_handler(int argc, char **argv)
 		{"keyring", '\0', 0, G_OPTION_ARG_FILENAME, &keyring, "keyring file", "PEMFILE"},
 		{"intermediate", '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &intermediate, "intermediate CA file name", "PEMFILE"},
 		{"mount", '\0', 0, G_OPTION_ARG_FILENAME, &mount, "mount prefix", "PATH"},
-		{"override-boot-slot", '\0', 0, G_OPTION_ARG_STRING, &bootslot, "override auto-detection of booted slot", "SLOTNAME"},
+		{"override-boot-slot", '\0', 0, G_OPTION_ARG_STRING, &bootslot, "override auto-detection of booted slot", "BOOTNAME"},
 		{"handler-args", '\0', 0, G_OPTION_ARG_STRING, &handlerextra, "extra handler arguments", "ARGS"},
 		{"debug", 'd', 0, G_OPTION_ARG_NONE, &debug, "enable debug output", NULL},
 		{"version", '\0', 0, G_OPTION_ARG_NONE, &version, "display version", NULL},
diff --git a/src/mark.c b/src/mark.c
index 98b25f93b..a8d4f8293 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -66,7 +66,7 @@ static RaucSlot* get_slot_by_identifier(const gchar *identifier, GError **error)
 			g_set_error(error,
 				    R_SLOT_ERROR,
 				    R_SLOT_ERROR_FAILED,
-				    "Invalid slot name format");
+				    "Invalid slot name format: '%s'", identifier);
 		}
 
 		g_strfreev(groupsplit);