diff --git a/crates/icepick-workflow/src/lib.rs b/crates/icepick-workflow/src/lib.rs
index c24ed04..a27a4b3 100644
--- a/crates/icepick-workflow/src/lib.rs
+++ b/crates/icepick-workflow/src/lib.rs
@@ -51,7 +51,7 @@ impl Input {
     }
 
     pub fn is_required(&self) -> bool {
-        self.optional.is_some_and(|o| o)
+        self.optional.is_some_and(|o| !o)
     }
 }
 
diff --git a/crates/icepick/src/cli/workflow.rs b/crates/icepick/src/cli/workflow.rs
index ff6ec02..6045a62 100644
--- a/crates/icepick/src/cli/workflow.rs
+++ b/crates/icepick/src/cli/workflow.rs
@@ -95,25 +95,22 @@ pub fn generate_command(workflow: &Workflow) -> clap::Command {
     // NOTE: all required inputs are still marked as .required(false) since they could be included
     // in the `--input-file` argument.
     for input in workflow.inputs.iter() {
-        for arg in input.identifiers() {
-            let arg = clap::Arg::new(arg)
-                .required(false)
-                .help(&input.description)
-                .long(arg.replace('_', "-"))
-                .value_name(arg.to_uppercase())
-                .conflicts_with_all(
-                    input
-                        .identifiers()
-                        .filter(|name| *name != arg)
-                        .collect::<Vec<_>>(),
-                );
-            command = command.arg(arg);
-        }
+        let name = &input.name;
+        let arg = clap::Arg::new(name)
+            .required(false)
+            .help(&input.description)
+            .long(name.replace('_', "-"))
+            .value_name(name.to_uppercase())
+            .visible_aliases(&input.aliases);
+        command = command.arg(arg);
     }
-    command.arg(clap::arg!(
-        --"input-file" [FILE]
-        "A file containing any inputs not passed on the command line"
-    ))
+    command.arg(
+        clap::arg!(
+            --"input-file" [FILE]
+            "A file containing any inputs not passed on the command line"
+        )
+        .value_parser(clap::value_parser!(std::path::PathBuf)),
+    )
 }
 
 fn load_inputs<'a>(
@@ -127,11 +124,7 @@ fn load_inputs<'a>(
         .and_then(|f| serde_json::from_reader(f).ok());
     for input in inputs {
         let identifier = &input.name;
-        match input
-            .identifiers()
-            .filter_map(|name| matches.get_one::<String>(name))
-            .next()
-        {
+        match matches.get_one::<String>(&input.name) {
             Some(value) => {
                 map.insert(identifier.clone(), value.clone());
                 continue;
diff --git a/crates/icepick/workflows/sol/generate-nonce-account.yaml b/crates/icepick/workflows/sol/generate-nonce-account.yaml
index eb946fd..78b26a7 100644
--- a/crates/icepick/workflows/sol/generate-nonce-account.yaml
+++ b/crates/icepick/workflows/sol/generate-nonce-account.yaml
@@ -15,6 +15,10 @@ inputs:
     workflows) is required to be a signer of the transaction, so the
     authorization address is often the principal address - the one performing
     the transaction.
+  aliases:
+  - primary_address
+  - principal_address
+  - pubkey
 step:
 - type: "sol-generate-wallet"
 - type: "sol-get-wallet-address"