diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 1985a9e4..242a73de 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2021-01-31"
+channel = "1.52"
 components = ["clippy"]
 targets = ["armv7-unknown-linux-gnueabihf"]
diff --git a/swap/src/bin/asb.rs b/swap/src/bin/asb.rs
index afef29f3..1097fb69 100644
--- a/swap/src/bin/asb.rs
+++ b/swap/src/bin/asb.rs
@@ -353,7 +353,7 @@ async fn register_tor_services(
                 }
             })
         })
-        .filter_map(|details| details)
+        .flatten()
         .collect::<Vec<_>>();
 
     let key = seed.derive_torv3_key();
diff --git a/swap/src/protocol/alice/state.rs b/swap/src/protocol/alice/state.rs
index 80f12a0a..42d605d8 100644
--- a/swap/src/protocol/alice/state.rs
+++ b/swap/src/protocol/alice/state.rs
@@ -308,8 +308,8 @@ impl State2 {
 
         let tx_cancel_sig = self.a.sign(tx_cancel.digest());
         Message3 {
-            tx_refund_encsig,
             tx_cancel_sig,
+            tx_refund_encsig,
         }
     }