diff --git a/Cargo.lock b/Cargo.lock
index bd5455dc..17695d73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6198,6 +6198,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
+ "libsecp256k1",
  "pallet-balances",
  "pallet-erc20-manager",
  "pallet-ethereum",
@@ -6209,6 +6210,7 @@ dependencies = [
  "pallet-user-fee-selector",
  "pallet-validator-fee-selector",
  "parity-scale-codec",
+ "rlp",
  "runner",
  "scale-info",
  "sp-core",
diff --git a/primitives/transaction-validator/src/mock.rs b/primitives/transaction-validator/src/mock.rs
index 6cbb73f6..a83988b2 100644
--- a/primitives/transaction-validator/src/mock.rs
+++ b/primitives/transaction-validator/src/mock.rs
@@ -27,7 +27,7 @@ use frame_support::{
 };
 use hex::FromHex;
 use pallet_evm::{EnsureAddressNever, EnsureAddressRoot};
-use sp_core::{H160, H256, U256, ConstU32};
+use sp_core::{ConstU32, H160, H256, U256};
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentifyAccount, IdentityLookup, Verify},
 	MultiSignature,
@@ -108,7 +108,7 @@ impl pallet_timestamp::Config for Runtime {
 
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::max_value();
-	pub const WeightPerGas: Weight = Weight::from_ref_time(1);
+	pub const WeightPerGas: Weight = Weight::from_parts(1, 0);
 	pub ERC20SlotZero: H160 = H160::from_str("0x22D598E0a9a1b474CdC7c6fBeA0B4F83E12046a9").unwrap();
 	pub ZeroSlot : H256 = H256::from_low_u64_be(0);
 	pub const GasLimitPovSizeRatio: u64 = 15;
@@ -118,7 +118,7 @@ impl FeeCalculator for FixedBaseFee {
 	fn min_gas_price() -> (U256, Weight) {
 		(
 			U256::from(1_000_000_000),
-			Weight::from_ref_time(1_000_000_000),
+			Weight::from_parts(1_000_000_000, 0),
 		)
 	}
 }
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 59d73465..135d6ff4 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -935,7 +935,6 @@ impl pallet_sponsored_transactions::Config for Runtime {
 
 impl pallet_zero_gas_transactions::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
-	type UserFeeTokenController = pallet_user_fee_selector::Pallet<Self>;
 }
 
 parameter_types! {