diff --git a/Cargo.lock b/Cargo.lock
index 6b1d4b2..9d9311b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -85,6 +85,17 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "crate-git-revision"
+version = "0.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54851b5b3f24621804b1cded2820975623c205e3055d2d44031cdb1237339ac8"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -551,17 +562,16 @@ version = "0.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee1832fb50c651ad10f734aaf5d31ca5acdfb197a6ecda64d93fcdb8885af913"
 dependencies = [
- "crate-git-revision",
+ "crate-git-revision 0.0.6",
  "data-encoding",
 ]
 
 [[package]]
 name = "stellar-xdr"
 version = "27.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ff843326969bdf1ef673dcdba94c08f4a3c8f1e58d6e6ef39b1bd4f749179a"
+source = "git+https://github.com/stellar/rs-stellar-xdr?rev=3305b3e31f19fdb4e64e4b7a4354bb120cdf4415#3305b3e31f19fdb4e64e4b7a4354bb120cdf4415"
 dependencies = [
- "crate-git-revision",
+ "crate-git-revision 0.0.9",
  "escape-bytes",
  "ethnum",
  "hex",
diff --git a/Cargo.toml b/Cargo.toml
index 456410f..170096f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ license = "Apache-2.0"
 
 [dependencies]
 petgraph = "=0.6.5"
-stellar-xdr = "=27.0.0"
+stellar-xdr = { version = "=27.0.0", git = "https://github.com/stellar/rs-stellar-xdr", rev = "3305b3e31f19fdb4e64e4b7a4354bb120cdf4415" }
 json = { version = "0.12.4", optional = true }
 itertools = "0.10.5"
 stellar-strkey = "0.0.13"
diff --git a/src/fbas.rs b/src/fbas.rs
index d33ff51..d64171e 100644
--- a/src/fbas.rs
+++ b/src/fbas.rs
@@ -262,7 +262,7 @@ impl Fbas {
         let mut known_qsets = BTreeMap::new();
 
         // First pass: add all validators
-        for (node_str, _) in qsm.iter() {
+        for node_str in qsm.keys() {
             let idx = fbas.add_validator(node_str.clone());
             known_validators.insert(node_str, idx);
         }