diff --git a/src/rust/amadeus-rs/amadeus/src/amadeus.rs b/src/rust/amadeus-rs/amadeus/src/amadeus.rs
index 6d33cb273c2a4099c7272ff4df8edc02de047a41..05da069774cffd36db4550add52a8adad87b8aa9 100644
--- a/src/rust/amadeus-rs/amadeus/src/amadeus.rs
+++ b/src/rust/amadeus-rs/amadeus/src/amadeus.rs
@@ -395,19 +395,16 @@ impl Amadeus<'_> {
     /// Handle quits/exits of the deamons
     fn handle_deamons_exit(&mut self) {
         // Handle the deamon closing process.
-        if let Some(((socket,), status_deamon)) = &self.status_deamon {
+        if let Some((_, status_deamon)) = &mut self.status_deamon {
             if status_deamon.should_quit() {
-                drop(socket);
                 self.lektord_status = None;
                 self.lektord_current = None;
                 status_deamon.join();
                 self.status_deamon = None;
             }
         };
-        if let Some(((socket_out, socket_in), deamon)) = &self.deamon {
+        if let Some((_, deamon)) = &mut self.deamon {
             if deamon.should_quit() {
-                drop(socket_out);
-                drop(socket_in);
                 deamon.join();
                 self.deamon = None;
             }
diff --git a/src/rust/amadeus-rs/amadeus/src/widgets/window.rs b/src/rust/amadeus-rs/amadeus/src/widgets/window.rs
index 159bfc625ae74411fc96f2d24fd068ad6ff1396c..afa682f70c25c5c771a6125e235d78e8d02059ef 100644
--- a/src/rust/amadeus-rs/amadeus/src/widgets/window.rs
+++ b/src/rust/amadeus-rs/amadeus/src/widgets/window.rs
@@ -101,10 +101,12 @@ impl<'a> WindowBuilder<'a> {
                         .clicked()
                         .then(|| flag_copy = false);
 
-                    self.actions
-                        .map(|actions| render_action_menu(ui, &actions, "▶", &mut temp_actions));
-                    self.warning_actions
-                        .map(|actions| render_action_menu(ui, &actions, "⚠", &mut temp_actions));
+                    if let Some(actions) = self.actions {
+                        render_action_menu(ui, &actions, "▶", &mut temp_actions)
+                    }
+                    if let Some(actions) = self.warning_actions {
+                        render_action_menu(ui, &actions, "⚠", &mut temp_actions)
+                    }
 
                     ui.colored_label(constants::get_text_color(self.dark_mode), self.name);
                 });
diff --git a/src/rust/amadeus-rs/lkt-lib/src/connexion.rs b/src/rust/amadeus-rs/lkt-lib/src/connexion.rs
index 44325977a0431ebfd69caf86d4fccecb87fa8a2e..243155f155925ca69769bbd6aba175023955127a 100644
--- a/src/rust/amadeus-rs/lkt-lib/src/connexion.rs
+++ b/src/rust/amadeus-rs/lkt-lib/src/connexion.rs
@@ -94,7 +94,12 @@ impl LektorConnexion {
             match self.read_replies() {
                 Err(e) => return Err(e),
                 Ok((res, _)) if res.is_empty() => return Ok(()),
-                Ok((res, None)) => return Ok(previous_ret.extend(res)),
+                Ok((res, None)) => {
+                    return {
+                        previous_ret.extend(res);
+                        Ok(())
+                    }
+                }
                 Ok((res, Some(cont))) => {
                     previous_ret.extend(res);
                     self.write_string(
diff --git a/src/rust/amadeus-rs/lkt-lib/src/response.rs b/src/rust/amadeus-rs/lkt-lib/src/response.rs
index e808a301e0b205383cf3d9538f00c1dc99db149a..127fa3037ba6c8782723b4ded5ec76d6af7e6513 100644
--- a/src/rust/amadeus-rs/lkt-lib/src/response.rs
+++ b/src/rust/amadeus-rs/lkt-lib/src/response.rs
@@ -315,8 +315,8 @@ impl FromLektorResponse for LektorCurrentKaraResponse {
         let song_type_number = response.pop("type")?;
         let (song_type, song_number) = match song_type_number.find(char::is_numeric) {
             Some(index) => (
-                (&song_type_number[..index]).to_owned(),
-                match (&song_type_number[index..]).parse::<usize>() {
+                song_type_number[..index].to_owned(),
+                match song_type_number[index..].parse::<usize>() {
                     Ok(x) => Some(x),
                     Err(_) => None,
                 },
diff --git a/src/rust/amadeus-rs/lkt-rs/src/main.rs b/src/rust/amadeus-rs/lkt-rs/src/main.rs
index 7be725a37e9773f35e73660b2fdd2e7787f63b0d..f50969b3de81a74ab32d1247b7aca91ed3f0ee14 100644
--- a/src/rust/amadeus-rs/lkt-rs/src/main.rs
+++ b/src/rust/amadeus-rs/lkt-rs/src/main.rs
@@ -1,7 +1,7 @@
 use lkt_lib::*;
 
 fn main() {
-    let mut lektor = LektorConnexion::new("localhost".to_owned(), 6600).unwrap();
+    let mut lektor = LektorConnexion::new("localhost", 6600).unwrap();
     if lektor.send_query(LektorQuery::Ping).is_ok() {}
 
     if let Ok(LektorResponse::CurrentKara(current)) = lektor.send_query(LektorQuery::CurrentKara) {