diff --git a/src/blockchain/compact_filters/peer.rs b/src/blockchain/compact_filters/peer.rs
index 8ef33229..683e25db 100644
--- a/src/blockchain/compact_filters/peer.rs
+++ b/src/blockchain/compact_filters/peer.rs
@@ -227,12 +227,12 @@ impl Peer {
 
         Ok(Peer {
             writer,
-            reader_thread,
             responses,
+            reader_thread,
             connected,
             mempool,
-            network,
             version,
+            network,
         })
     }
 
diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs
index 6127b5fd..499c9a1b 100644
--- a/src/wallet/mod.rs
+++ b/src/wallet/mod.rs
@@ -277,7 +277,7 @@ where
         self.descriptor
             .as_derived(index, &self.secp)
             .address(self.network)
-            .map(|address| AddressInfo { address, index })
+            .map(|address| AddressInfo { index, address })
             .map_err(|_| Error::ScriptDoesntHaveAddressForm)
     }
 
@@ -289,7 +289,7 @@ where
         self.descriptor
             .as_derived(index, &self.secp)
             .address(self.network)
-            .map(|address| AddressInfo { address, index })
+            .map(|address| AddressInfo { index, address })
             .map_err(|_| Error::ScriptDoesntHaveAddressForm)
     }