diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index 041f77c7ee..6460219379 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -417,7 +417,7 @@ pub fn entry(opts: Opts) -> Result<()> {
             cargo_args,
         ),
         #[cfg(feature = "dev")]
-        Command::Airdrop => airdrop(cfg_override),
+        Command::Airdrop { .. } => airdrop(&opts.cfg_override),
         Command::Cluster { subcmd } => cluster(subcmd),
         Command::Shell => shell(&opts.cfg_override),
         Command::Run { script } => run(&opts.cfg_override, script),
@@ -2410,7 +2410,9 @@ fn set_workspace_dir_or_exit() {
 fn airdrop(cfg_override: &ConfigOverride) -> Result<()> {
     let url = cfg_override
         .cluster
-        .unwrap_or_else(|| "https://api.devnet.solana.com".to_string());
+        .as_ref()
+        .unwrap_or_else(|| &Cluster::Devnet)
+        .url();
     loop {
         let exit = std::process::Command::new("solana")
             .arg("airdrop")
diff --git a/spl/src/dex.rs b/spl/src/dex.rs
index da83b1ad11..a8cb0ccd4f 100644
--- a/spl/src/dex.rs
+++ b/spl/src/dex.rs
@@ -1,11 +1,9 @@
 use anchor_lang::solana_program::account_info::AccountInfo;
 use anchor_lang::solana_program::entrypoint::ProgramResult;
-use anchor_lang::solana_program::program_error::ProgramError;
 use anchor_lang::solana_program::pubkey::Pubkey;
 use anchor_lang::{context::CpiContext, Accounts, ToAccountInfos};
 use serum_dex::instruction::SelfTradeBehavior;
 use serum_dex::matching::{OrderType, Side};
-use std::io::Write;
 use std::num::NonZeroU64;
 
 pub use serum_dex;