diff --git a/solana/bridge/src/vaa.rs b/solana/bridge/src/vaa.rs
index 62628635..baa1a22e 100644
--- a/solana/bridge/src/vaa.rs
+++ b/solana/bridge/src/vaa.rs
@@ -57,7 +57,7 @@ impl VAA {
         let hash = h.finalize().into();
 
         // Check quorum
-        if self.signatures.len() < ((guardian_keys.len() as f32 / 4f32 * 3f32).ceil() as usize) {
+        if self.signatures.len() < (((guardian_keys.len() / 4) * 3) + 1 as usize) {
             return false;
         }
 
diff --git a/solana/devnet_setup.sh b/solana/devnet_setup.sh
index d07f4201..d0fa61bb 100755
--- a/solana/devnet_setup.sh
+++ b/solana/devnet_setup.sh
@@ -15,7 +15,7 @@ EOF
 # Constants
 cli_address=6sbzC1eH4FTujJXWj51eQe25cYvr4xfXbJ1vAj7j2k5J
 bridge_address=Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
-initial_guardian=5b1869D9A4C187F2EAa108f3062412ecf0526b24
+initial_guardian=befa429d57cd18b7f8a4d91a2da9ab4af05d0fbe
 chain_id_ethereum=2
 
 # TODO: use proper confirmation level to avoid retries (except for faucet, which waits for devnet to come up)