diff --git a/src/evm.rs b/src/evm.rs
index f5c06ae..99611a9 100644
--- a/src/evm.rs
+++ b/src/evm.rs
@@ -1801,7 +1801,7 @@ where
     pub fn estimate_gas(mut self) -> Result<(crate::EstimationResult, Self), EvmErrored<Db, Insp>> {
         use tracing::{debug, enabled};
 
-        if let Some(est) = crate::trevm_try!(self.estimate_gas_simple_transfer(), self) {
+        if let Some(est) = trevm_try!(self.estimate_gas_simple_transfer(), self) {
             return Ok((crate::EstimationResult::basic_transfer_success(est), self));
         }
 
diff --git a/src/fill/alloy.rs b/src/fill/alloy.rs
index 723b67d..2724ea4 100644
--- a/src/fill/alloy.rs
+++ b/src/fill/alloy.rs
@@ -327,11 +327,12 @@ impl Tx for alloy::rpc::types::TransactionRequest {
         // intend that to mean "as much as possible"
         *tx_type = self.transaction_type.unwrap_or(TxType::Eip1559 as u8);
         *gas_limit = self.gas.unwrap_or(u64::MAX);
-        *gas_price = self.gas_price.unwrap_or_default();
+        *gas_price =
+            self.gas_price.unwrap_or_default().max(self.max_fee_per_gas.unwrap_or_default());
         *kind = self.to.unwrap_or_default();
         *value = self.value.unwrap_or_default();
         *data = self.input.input().cloned().unwrap_or_default();
-        *nonce = self.nonce.unwrap_or_default(); // TODO: IS THIS CORRECT?
+        *nonce = self.nonce.unwrap_or_default();
         *chain_id = self.chain_id;
         *access_list = self.access_list.clone().unwrap_or_default();
         *gas_priority_fee = self.max_priority_fee_per_gas;