diff --git a/rusk-wallet/src/bin/command.rs b/rusk-wallet/src/bin/command.rs
index fbc755439..009923f15 100644
--- a/rusk-wallet/src/bin/command.rs
+++ b/rusk-wallet/src/bin/command.rs
@@ -420,7 +420,7 @@ pub(crate) enum Command {
         amt: Dusk,
 
         /// Max amount of gas for this transaction
-        #[clap(short = 'l', long, default_value_t = DEFAULT_LIMIT_TRANSFER)]
+        #[clap(short = 'l', long, default_value_t = DEFAULT_LIMIT_CALL)]
         gas_limit: u64,
 
         /// Price you're going to pay for each gas unit (in LUX)
@@ -455,7 +455,7 @@ pub(crate) enum Command {
         amt: Dusk,
 
         /// Max amount of gas for this transaction
-        #[clap(short = 'l', long, default_value_t = DEFAULT_LIMIT_TRANSFER)]
+        #[clap(short = 'l', long, default_value_t = DEFAULT_LIMIT_CALL)]
         gas_limit: u64,
 
         /// Price you're going to pay for each gas unit (in LUX)
diff --git a/rusk-wallet/src/bin/interactive.rs b/rusk-wallet/src/bin/interactive.rs
index 0ae063b3e..bdde32c80 100644
--- a/rusk-wallet/src/bin/interactive.rs
+++ b/rusk-wallet/src/bin/interactive.rs
@@ -498,9 +498,7 @@ fn menu_op(
             AddrOp::Run(Box::new(Command::MoonlightToPhoenix {
                 addr_idx: Some(addr_idx),
                 amt: prompt::request_token_amt("convert", moonlight_balance)?,
-                gas_limit: prompt::request_gas_limit(
-                    gas::DEFAULT_LIMIT_TRANSFER,
-                )?,
+                gas_limit: prompt::request_gas_limit(gas::DEFAULT_LIMIT_CALL)?,
                 gas_price: prompt::request_gas_price()?,
             }))
         }
@@ -508,9 +506,7 @@ fn menu_op(
             AddrOp::Run(Box::new(Command::PhoenixToMoonlight {
                 addr_idx: Some(addr_idx),
                 amt: prompt::request_token_amt("convert", phoenix_balance)?,
-                gas_limit: prompt::request_gas_limit(
-                    gas::DEFAULT_LIMIT_TRANSFER,
-                )?,
+                gas_limit: prompt::request_gas_limit(gas::DEFAULT_LIMIT_CALL)?,
                 gas_price: prompt::request_gas_price()?,
             }))
         }
diff --git a/rusk-wallet/src/wallet.rs b/rusk-wallet/src/wallet.rs
index fbc6a1e50..4007fbc55 100644
--- a/rusk-wallet/src/wallet.rs
+++ b/rusk-wallet/src/wallet.rs
@@ -973,7 +973,7 @@ impl<F: SecureWalletFile + Debug> Wallet<F> {
         let state = self.state()?;
 
         let pk = self.bls_pk(sender_idx)?;
-        let nonce = state.fetch_account(pk).await?.nonce + 1;
+        let moonlight_nonce = state.fetch_account(pk).await?.nonce + 1;
         let chain_id = state.fetch_chain_id().await?;
 
         let mut sender_sk = self.derive_bls_sk(sender_idx);
@@ -985,7 +985,7 @@ impl<F: SecureWalletFile + Debug> Wallet<F> {
             init_args,
             gas.limit,
             gas.price,
-            nonce,
+            moonlight_nonce,
             deploy_nonce,
             chain_id,
         )?;