diff --git a/substrate/.gitignore b/substrate/.gitignore
index 6398c09fe7..353d49df28 100644
--- a/substrate/.gitignore
+++ b/substrate/.gitignore
@@ -21,3 +21,4 @@ rls*.log
 .local
 **/hfuzz_target/
 **/hfuzz_workspace/
+.cargo/
diff --git a/substrate/client/cli/src/commands/build_spec_cmd.rs b/substrate/client/cli/src/commands/build_spec_cmd.rs
index 2f9e2fa059..d2e2ef3a54 100644
--- a/substrate/client/cli/src/commands/build_spec_cmd.rs
+++ b/substrate/client/cli/src/commands/build_spec_cmd.rs
@@ -24,6 +24,7 @@ use log::info;
 use sc_network::config::build_multiaddr;
 use sc_service::{config::MultiaddrWithPeerId, Configuration};
 use structopt::StructOpt;
+use std::io::Write;
 
 /// The `build-spec` command used to build a specification.
 #[derive(Debug, StructOpt, Clone)]
@@ -66,9 +67,9 @@ impl BuildSpecCmd {
 		}
 
 		let json = sc_service::chain_ops::build_spec(&*spec, raw_output)?;
-
-		print!("{}", json);
-
+		if std::io::stdout().write_all(json.as_bytes()).is_err() {
+			let _ = std::io::stderr().write_all(b"Error writing to stdout\n");
+		}
 		Ok(())
 	}
 }
diff --git a/substrate/client/cli/src/commands/export_state_cmd.rs b/substrate/client/cli/src/commands/export_state_cmd.rs
index 3ad6772882..33111e7737 100644
--- a/substrate/client/cli/src/commands/export_state_cmd.rs
+++ b/substrate/client/cli/src/commands/export_state_cmd.rs
@@ -22,7 +22,7 @@ use crate::{
 use log::info;
 use sc_service::{Configuration, ServiceBuilderCommand};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
-use std::{fmt::Debug, str::FromStr};
+use std::{fmt::Debug, str::FromStr, io::Write};
 use structopt::StructOpt;
 
 /// The `export-state` command used to export the state of a given block into
@@ -65,9 +65,9 @@ impl ExportStateCmd {
 
 		info!("Generating new chain spec...");
 		let json = sc_service::chain_ops::build_spec(&*input_spec, true)?;
-
-		print!("{}", json);
-
+		if std::io::stdout().write_all(json.as_bytes()).is_err() {
+			let _ = std::io::stderr().write_all(b"Error writing to stdout\n");
+		}
 		Ok(())
 	}
 }