diff --git a/emu-configs/retroarch/retroarch-core-options.cfg b/emu-configs/retroarch/retroarch-core-options.cfg
index ef112dce..06420de7 100644
--- a/emu-configs/retroarch/retroarch-core-options.cfg
+++ b/emu-configs/retroarch/retroarch-core-options.cfg
@@ -294,8 +294,6 @@ gambatte_rumble_level = "10"
 gambatte_show_gb_link_settings = "disabled"
 gambatte_turbo_period = "4"
 gambatte_up_down_allowed = "disabled"
-gambatte_input_player1_r = "nul"
-gambatte_input_player1_l = "nul"
 genesis_plus_gx_add_on = "auto"
 genesis_plus_gx_addr_error = "enabled"
 genesis_plus_gx_aspect_ratio = "auto"
diff --git a/emu-configs/retroarch/retroarch.cfg b/emu-configs/retroarch/retroarch.cfg
index 3bda1f75..2fc14c02 100644
--- a/emu-configs/retroarch/retroarch.cfg
+++ b/emu-configs/retroarch/retroarch.cfg
@@ -80,7 +80,7 @@ cheevos_visibility_account = "true"
 cheevos_visibility_mastery = "true"
 cheevos_visibility_summary = "1"
 cheevos_visibility_unlock = "true"
-config_save_on_exit = "false"
+config_save_on_exit = "true"
 content_database_path = "/app/share/libretro/database/rdb"
 content_favorites_directory = "default"
 content_favorites_path = "/var/config/retroarch/content_favorites.lpl"
diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml
index 93de24b3..8247458d 100644
--- a/es-configs/es_settings.xml
+++ b/es-configs/es_settings.xml
@@ -143,7 +143,7 @@
 <string name="ScraperUsernameScreenScraper" value="" />
 <string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" />
 <string name="ScreensaverType" value="video" />
-<string name="StartupSystem" value="" />
+<string name="StartupSystem" value="recent" />
 <string name="ThemeAspectRatio" value="automatic" />
 <string name="ThemeColorScheme" value="art-book-next" />
 <string name="ThemeSet" value="art-book-next-es-de" />