diff --git a/contracts/contracts/validator-registry/VanillaRegistry.sol b/contracts/contracts/validator-registry/VanillaRegistry.sol
index 2f9e35a75..c788a05a2 100644
--- a/contracts/contracts/validator-registry/VanillaRegistry.sol
+++ b/contracts/contracts/validator-registry/VanillaRegistry.sol
@@ -46,6 +46,7 @@ contract VanillaRegistry is IVanillaRegistry, VanillaRegistryStorage,
         uint256 _slashingPayoutPeriodBlocks,
         address _owner
     ) external initializer {
+        __Pausable_init();
         _setMinStake(_minStake);
         _setSlashOracle(_slashOracle);
         _setUnstakePeriodBlocks(_unstakePeriodBlocks);
diff --git a/contracts/lib/openzeppelin-upgrades b/contracts/lib/openzeppelin-upgrades
index 08c6cd4f7..696e20f37 160000
--- a/contracts/lib/openzeppelin-upgrades
+++ b/contracts/lib/openzeppelin-upgrades
@@ -1 +1 @@
-Subproject commit 08c6cd4f789338617c19e8165b73c7084b11b45c
+Subproject commit 696e20f37d9fb61ba26ae4a7bac2cecd907d3835
diff --git a/contracts/test/core/OracleTest.sol b/contracts/test/core/OracleTest.sol
index ac57ddacf..8140b8008 100644
--- a/contracts/test/core/OracleTest.sol
+++ b/contracts/test/core/OracleTest.sol
@@ -813,12 +813,6 @@ contract OracleTest is Test {
         bidSignature = abi.encodePacked(r, s, v);
 
         bytes32 commitmentDigest = preconfManager.getPreConfHash(
-            // txnHash,
-            // revertingTxHashes,
-            // bid,
-            // blockNumber,
-            // decayStartTimestamp,
-            // decayEndTimestamp,
             bidHash,
             bidSignature,
             zkproof
diff --git a/p2p/pkg/preconfirmation/encryptor/encryptor.go b/p2p/pkg/preconfirmation/encryptor/encryptor.go
index 0bec24199..abe1a83dd 100644
--- a/p2p/pkg/preconfirmation/encryptor/encryptor.go
+++ b/p2p/pkg/preconfirmation/encryptor/encryptor.go
@@ -367,14 +367,9 @@ func computePreConfStructHash(c *preconfpb.PreConfirmation, sharedKey *bn254.G1A
 	}
 	signatureHash := crypto.Keccak256Hash(c.Bid.Signature)
 
-	bidderPK, err := p2pcrypto.BN254PublicKeyFromBytes(c.Bid.NikePublicKey)
-	if err != nil {
-		return common.Hash{}, err
-	}
-
 	var sharedKeyXBigInt, sharedKeyYBigInt big.Int
-	bidderPK.X.BigInt(&sharedKeyXBigInt)
-	bidderPK.Y.BigInt(&sharedKeyYBigInt)
+	sharedKey.X.BigInt(&sharedKeyXBigInt)
+	sharedKey.Y.BigInt(&sharedKeyYBigInt)
 
 	preConfStructType, err := abi.NewType("tuple", "", []abi.ArgumentMarshaling{
 		{Name: "EIP712CommitmentTypeHash", Type: "bytes32"},