diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e1cdd57e..579202f884 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1151,6 +1151,7 @@ if(${PLAYER_BUILD_EXECUTABLE} AND ${PLAYER_TARGET_PLATFORM} MATCHES "^SDL(1|2)$"
 			"-sALLOW_MEMORY_GROWTH -sMINIFY_HTML=0 -sMODULARIZE -sEXPORT_NAME=createEasyRpgPlayer \
 			 -sEXIT_RUNTIME --bind --pre-js ${PLAYER_JS_PREJS} --post-js ${PLAYER_JS_POSTJS} \
 			 -sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=['$autoResumeAudioContext','$dynCall'] \
+			 -sEXPORTED_RUNTIME_METHODS=['FS'] \
 			 -sEXPORTED_FUNCTIONS=_main,_malloc,_free")
 		set_source_files_properties("src/platform/sdl/main.cpp" PROPERTIES
 			OBJECT_DEPENDS "${PLAYER_JS_PREJS};${PLAYER_JS_POSTJS};${PLAYER_JS_SHELL}")
diff --git a/src/game_screen.cpp b/src/game_screen.cpp
index 7890357142..a80a88cc92 100644
--- a/src/game_screen.cpp
+++ b/src/game_screen.cpp
@@ -45,6 +45,8 @@ Game_Screen::~Game_Screen() {
 
 void Game_Screen::SetSaveData(lcf::rpg::SaveScreen screen)
 {
+	CancelBattleAnimation();
+
 	data = std::move(screen);
 }
 
diff --git a/src/scene_equip.cpp b/src/scene_equip.cpp
index 49149646dc..a5390f2a60 100644
--- a/src/scene_equip.cpp
+++ b/src/scene_equip.cpp
@@ -50,7 +50,7 @@ void Scene_Equip::Start() {
 	equip_window->SetIndex(equip_index);
 
 	for (int i = 0; i < 5; ++i) {
-		item_windows.push_back(std::make_shared<Window_EquipItem>(Player::menu_offset_x, Player::menu_offset_y + menu_help_height + menu_equip_status_height, MENU_WIDTH, MENU_HEIGHT - menu_help_height - menu_equip_status_height,actor.GetId(), i));
+		item_windows.push_back(std::make_shared<Window_EquipItem>(Player::menu_offset_x, Player::menu_offset_y + menu_help_height + menu_equip_status_height, MENU_WIDTH, MENU_HEIGHT - menu_help_height - menu_equip_status_height, actor, i));
 	}
 
 	// Assign the help windows
diff --git a/src/window_equipitem.cpp b/src/window_equipitem.cpp
index 457341c95f..487c011dc1 100644
--- a/src/window_equipitem.cpp
+++ b/src/window_equipitem.cpp
@@ -22,7 +22,7 @@
 #include <lcf/reader_util.h>
 #include "output.h"
 
-Window_EquipItem::Window_EquipItem(int ix, int iy, int iwidth, int iheight,  const Game_Actor& actor, int equip_type) :
+Window_EquipItem::Window_EquipItem(int ix, int iy, int iwidth, int iheight, const Game_Actor& actor, int equip_type) :
 	Window_Item(ix, iy, iwidth, iheight),
 	actor(actor) {
 	this->equip_type = equip_type;