diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 65e077379..0c18d5c85 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -3083,7 +3083,8 @@ SFXBase* Kart::getNextEmitter()
     m_emitter_id = (m_emitter_id + 1) % EMITTER_COUNT;
 
     // The emitter is requested when a new sound is to be played.
-    // Always reset the volume to 1.0f (full), see #3596
+    // Always reset the volume to 1.0f (full), as crashes may
+    // have altered it. See issue #3596
     m_emitters[m_emitter_id]->setVolume(1.0f);
 
     return m_emitters[m_emitter_id];
diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 4b5b2f00e..eba0a6aaf 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -73,7 +73,7 @@ RaceResultGUI::RaceResultGUI() : Screen("race_result.stkgui",
 
 //-----------------------------------------------------------------------------
 /** Besides calling init in the base class this makes all buttons of this
- *  screen invisible. The buttons will only displayed once the animation is
+ *  screen invisible. The buttons will be displayed only once the animation is
  *  over.
  */
 void RaceResultGUI::init()
diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index 7d31093bf..e3b846883 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -711,6 +711,7 @@ void TrackInfoScreen::eventCallback(Widget* widget, const std::string& name,
         else // Other modes
         {
             const int num_ai = m_ai_kart_spinner->getValue();
+            race_manager->setNumKarts( race_manager->getNumLocalPlayers() + num_ai );
             UserConfigParams::m_num_karts_per_gamemode[race_manager->getMinorMode()] = race_manager->getNumLocalPlayers() + num_ai;
             updateHighScores();
         }