diff --git a/rc_core/src/persist/user/account_json.rs b/rc_core/src/persist/user/account_json.rs
index 0598ce1..796db41 100644
--- a/rc_core/src/persist/user/account_json.rs
+++ b/rc_core/src/persist/user/account_json.rs
@@ -1052,7 +1052,7 @@ impl <C: Clone + Send> super::User<C> for UserData {
             log::error!("No selected vehicle slot for user_id {}", self.account.id);
             DATABASE_ERR
         })?;
-        let inc_opt = self.garage_upgrades.increments.iter().enumerate().filter(|(_i, inc)| inc.cpu <= selected_slot.bay_cpu as u32).next_back();
+        let inc_opt = self.garage_upgrades.increments.iter().enumerate().rfind(|(_i, inc)| inc.cpu <= selected_slot.bay_cpu as u32);
         if let Some((i, _)) = inc_opt {
             let max_upgrade = self.garage_upgrades.increments.len() - 1;
             let upgrade_to = i + (increments as usize);
diff --git a/rc_lobby_room/src/lobby.rs b/rc_lobby_room/src/lobby.rs
index 8702b56..a50c3c9 100644
--- a/rc_lobby_room/src/lobby.rs
+++ b/rc_lobby_room/src/lobby.rs
@@ -188,6 +188,7 @@ impl QueueHandler {
         ).await
     }
 
+    #[allow(clippy::too_many_arguments)]
     async fn enter_match_static(hostname: String, hostport: u16, network_conf: crate::data::network::NetworkConfigData, factory: std::sync::Arc<oj_rc_core::factory::Factory>, cpu_counter: std::sync::Arc<oj_rc_core::cubes::CpuListParser>, weapon_guesser: std::sync::Arc<oj_rc_core::cubes::WeaponListParser>, users_per_game: usize, key: QueueKey, mut players: Vec<QueueUser>, user: &(dyn oj_rc_core::persist::user::LobbyUser + Send + Sync)) {
         let guid_str = key.guid();
         let game_desc = oj_rc_core::persist::user::GameDescriptor {