diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp
index 618677866b..cbff78c659 100644
--- a/src/d/d_menu_save.cpp
+++ b/src/d/d_menu_save.cpp
@@ -1326,9 +1326,6 @@ void dMenu_save_c::memCardDataLoadWait() {
 }
 
 void dMenu_save_c::dataWrite() {
-    int stageNo = dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo());
-
-    dComIfGs_putSave(stageNo);
     dComIfGs_setMemoryToCard(mSaveBuffer, mSelectedFile);
     mDoMemCdRWm_SetCheckSumGameData(mSaveBuffer, mSelectedFile);
 
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index f3cdfed17b..c84616873a 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -326,6 +326,10 @@ int dStage_roomControl_c::loadRoom(int roomCount, u8* rooms, bool param_2) {
     if (!r26) {
         return FALSE;
     }
+
+    #if TARGET_PC
+    triggerAutoSave();
+    #endif
     
     for (int i = 0; i < roomCount; i++) {
         int roomNo = dStage_roomRead_dt_c_GetLoadRoomIndex(rooms[i]);
diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp
index 2ee6dd5e40..9aa1763b8a 100644
--- a/src/f_ap/f_ap_game.cpp
+++ b/src/f_ap/f_ap_game.cpp
@@ -28,9 +28,7 @@
 #include <dusk/imgui/ImGuiConsole.hpp>
 #include <m_Do/m_Do_MemCardRWmng.h>
 #include <m_Do/m_Do_MemCard.h>
-#include <d/d_file_select.h>
 #endif
-#include <d/d_s_logo.h>
 
 fapGm_HIO_c::fapGm_HIO_c() {
     mUsingHostIO = true;