diff --git a/src/commands/classified.rs b/src/commands/classified.rs
index 440413ddd..7204af77c 100644
--- a/src/commands/classified.rs
+++ b/src/commands/classified.rs
@@ -251,7 +251,7 @@ impl ExternalCommand {
                             )
                         } else {
                             ShellError::labeled_error(
-                                "Error: $it needs string data",
+                                "$it needs string data",
                                 "given something else",
                                 self.name_tag.clone(),
                             )
diff --git a/src/commands/config.rs b/src/commands/config.rs
index 82fbbf1db..4f9625b21 100644
--- a/src/commands/config.rs
+++ b/src/commands/config.rs
@@ -71,7 +71,7 @@ pub fn config(
     if let Some(v) = get {
         let key = v.to_string();
         let value = result.get(&key).ok_or_else(|| {
-            ShellError::labeled_error(&format!("Missing key in config"), "key", v.tag())
+            ShellError::labeled_error("Missing key in config", "key", v.tag())
         })?;
 
         let mut results = VecDeque::new();
@@ -121,7 +121,7 @@ pub fn config(
             config::write(&result, &configuration)?;
         } else {
             return Err(ShellError::labeled_error(
-                "{} does not exist in config",
+                "Key does not exist in config",
                 "key",
                 v.tag(),
             ));
diff --git a/src/plugins/docker.rs b/src/plugins/docker.rs
index 9cb8a52e8..e0a06ab3d 100644
--- a/src/plugins/docker.rs
+++ b/src/plugins/docker.rs
@@ -21,8 +21,8 @@ async fn docker(sub_command: &String, name: Tag) -> Result<Vec<Tagged<Value>>, S
         "images" => docker_images(name),
         _ => Err(ShellError::labeled_error(
             "Unsupported Docker command",
-            format!("'{}'?", sub_command),
-            name.span,
+            "unknown docker command",
+            name,
         )),
     }
 }
@@ -46,7 +46,7 @@ fn process_docker_output(cmd_output: &str, tag: Tag) -> Result<Vec<Tagged<Value>
             .filter(|s| s.trim() != "")
             .collect();
 
-        let mut dict = TaggedDictBuilder::new(tag);
+        let mut dict = TaggedDictBuilder::new(&tag);
         for (i, v) in values.iter().enumerate() {
             dict.insert(header[i].to_string(), Value::string(v.trim().to_string()));
         }
@@ -92,18 +92,13 @@ impl Plugin for Docker {
         if let Some(args) = callinfo.args.positional {
             match &args[0] {
                 Tagged {
-                    item: Value::Primitive(Primitive::String(s)),
+                    item: Value::Primitive(Primitive::String(command)),
                     ..
-                } => match block_on(docker(&s, callinfo.name_tag)) {
+                } => match block_on(docker(&command, args[0].tag())) {
                     Ok(v) => return Ok(v.into_iter().map(ReturnSuccess::value).collect()),
                     Err(e) => return Err(e),
                 },
-                _ => {
-                    return Err(ShellError::string(format!(
-                        "Unrecognized type in params: {:?}",
-                        args[0]
-                    )))
-                }
+                _ => return Err(ShellError::type_error("string", args[0].tagged_type_name())),
             }
         }