diff --git a/contracts/auction-handler/FastLaneAuctionHandler.sol b/contracts/auction-handler/FastLaneAuctionHandler.sol
index 1d7bb1c..6cd5a8e 100644
--- a/contracts/auction-handler/FastLaneAuctionHandler.sol
+++ b/contracts/auction-handler/FastLaneAuctionHandler.sol
@@ -260,6 +260,12 @@ contract FastLaneAuctionHandler is FastLaneAuctionHandlerEvents {
         returns (uint256 bidAmount) {
             emit RelayFastBid(msg.sender, block.coinbase, true, bidAmount, searcherToAddress);
         } catch {
+            if (msg.value > 0) {
+                SafeTransferLib.safeTransferETH(
+                    msg.sender, 
+                    msg.value
+                );
+            }
             emit RelayFastBid(msg.sender, block.coinbase, false, 0, searcherToAddress);
         }
     }
@@ -513,7 +519,7 @@ contract FastLaneAuctionHandler is FastLaneAuctionHandlerEvents {
         limitedReentrant(paymentProcessor)
         validPayee
     {
-        if (paymentProcessor == address(0)) revert RelayProcessorCannotBeZero();
+        if (paymentProcessor == address(0) || paymentProcessor == address(this)) revert RelayProcessorCannotBeZero();
 
         address validator = getValidator();
         uint256 validatorBalance = validatorsBalanceMap[validator] - 1;
diff --git a/foundry.toml b/foundry.toml
index 65c47be..989a0bc 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -15,5 +15,6 @@ bytecode_hash = "none"
 names = true
 sizes = true
 gas_price = 60000000000
-solc_version = '0.8.16'
+solc_version = '0.8.20'
+evm_version = 'paris'
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
\ No newline at end of file
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
index 0a25c19..3bd9ed3 160000
--- a/lib/openzeppelin-contracts
+++ b/lib/openzeppelin-contracts
@@ -1 +1 @@
-Subproject commit 0a25c1940ca220686588c4af3ec526f725fe2582
+Subproject commit 3bd9ed377e738a1cc66cca180a2a26426c63b8dc
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
index 58fa0f8..b6becf8 160000
--- a/lib/openzeppelin-contracts-upgradeable
+++ b/lib/openzeppelin-contracts-upgradeable
@@ -1 +1 @@
-Subproject commit 58fa0f81c4036f1a3b616fdffad2fd27e5d5ce21
+Subproject commit b6becf82d734bc66fec9cf25a48d598356f3bf11