diff --git a/rc_multiplayer/src/matches/fake/client_ai.rs b/rc_multiplayer/src/matches/fake/client_ai.rs
index b7779d5..a12de76 100644
--- a/rc_multiplayer/src/matches/fake/client_ai.rs
+++ b/rc_multiplayer/src/matches/fake/client_ai.rs
@@ -33,7 +33,7 @@ impl super::FakeUser for ClientAIPlayer {
         let first_fake_i = descriptors.iter()
             .filter(|x| x.team == self.me.team)
             .enumerate()
-            .find(|x| x.1.mode != None)
+            .find(|x| x.1.mode.is_some())
             .map(|(i, _)| i)
             .unwrap();
         let my_i = descriptors.iter()
diff --git a/rc_multiplayer/src/matches/generic.rs b/rc_multiplayer/src/matches/generic.rs
index e9a3819..28852e0 100644
--- a/rc_multiplayer/src/matches/generic.rs
+++ b/rc_multiplayer/src/matches/generic.rs
@@ -239,7 +239,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
             .collect();*/
 
         let descriptors = players.iter()
-            .map(|player| (player.player_id as u8, UserDescriptor::new(player.to_owned())))
+            .map(|player| (player.player_id, UserDescriptor::new(player.to_owned())))
             .collect();
 
         let user_id_map = players.iter()
@@ -538,7 +538,7 @@ impl <L: super::CustomGameLogic> GenericGamemodeEngine<L> {
                     for fake_id in conn.aliases.iter() {
                         if let Some(user_desc) = self.user_descriptor(*fake_id) {
                             user_desc.state.mode.store(ConnectionMode::Disconnected.to_u8(), std::sync::atomic::Ordering::Relaxed);
-                            let conn_opt = self.users.write().await.remove(&fake_id);
+                            let conn_opt = self.users.write().await.remove(fake_id);
                             if let Some(conn) = conn_opt {
                                 if self.custom_logic_handler.on_player_end(self, &conn, user_desc).await {
                                     disconnecting_players.push(*fake_id);
diff --git a/rc_multiplayer/src/matches/modes/team_death_match.rs b/rc_multiplayer/src/matches/modes/team_death_match.rs
index fe12f70..608cafa 100644
--- a/rc_multiplayer/src/matches/modes/team_death_match.rs
+++ b/rc_multiplayer/src/matches/modes/team_death_match.rs
@@ -259,7 +259,7 @@ impl TeamDeathMatchLogic {
 
     async fn do_respawn_tasks(&self, generic: &crate::matches::GenericGamemodeEngine<Self>, player_id: u8) {
         log::info!("Handling respawn player {} in game {}", player_id, generic.game_guid());
-        let respawn_time = std::time::Duration::from_secs(self.settings.respawn_time_seconds as u64);
+        let respawn_time = std::time::Duration::from_secs(self.settings.respawn_time_seconds);
         let now = chrono::Utc::now();
         let respawn_timestamp = now + respawn_time;
         if let Some(player_respawn) = self.player_tracking.respawns.get(&player_id) {