diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index 96203a67d7..ecde7441ac 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -515,7 +515,7 @@ void NetPlayClient::OnPlayerLeave(sf::Packet& packet)
     const auto& player = it->second;
     INFO_LOG_FMT(NETPLAY, "Player {} ({}) left", player.name, pid);
     m_dialog->OnPlayerDisconnect(player.name);
-    m_players.erase(m_players.find(pid));
+    m_players.erase(it);
   }
 
   m_dialog->Update();
diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
index e9f4f21980..e0ae924b83 100644
--- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
@@ -102,7 +102,7 @@ protected:
 
       for (auto remove_prefix : {"BTN_", "KEY_"})
       {
-        if (name.find(remove_prefix) == 0)
+        if (name.starts_with(remove_prefix))
           return std::string(name.substr(std::strlen(remove_prefix)));
       }