diff --git a/3rdparty/miniaudio b/3rdparty/miniaudio
index 347321b2..13d161bc 160000
--- a/3rdparty/miniaudio
+++ b/3rdparty/miniaudio
@@ -1 +1 @@
-Subproject commit 347321b27c58d42567e905c715de60ad43a6cb8e
+Subproject commit 13d161bc8d856ad61ae46b798bbeffc0f49808e8
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 4797aa7c..c95858df 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -938,6 +938,12 @@ MxResult IsleApp::SetupWindow()
 #endif
 
 	window = MORTAR_EX_CreateWindow(&createWindowProps);
+
+#ifdef __EMSCRIPTEN__
+	// Force correct window size since SDL3 may have picked up CSS dimensions
+	MORTAR_SetWindowSize(window, g_targetWidth, g_targetHeight);
+#endif
+
 	MORTAR_EXT_SetWindowProperty(window, MORTAR_WINDOW_PROPERTY_USER, &m_videoParam);
 
 	if (m_exclusiveFullScreen && m_fullScreen) {
diff --git a/extensions/src/textureloader.cpp b/extensions/src/textureloader.cpp
index b88a9dd3..a348b1a0 100644
--- a/extensions/src/textureloader.cpp
+++ b/extensions/src/textureloader.cpp
@@ -64,6 +64,7 @@ bool TextureLoader::PatchTexture(LegoTextureInfo* p_textureInfo)
 	if (details->bits_per_pixel == 8) {
 		MORTAR_Palette* sdlPalette = MORTAR_GetSurfacePalette(surface);
 		if (!sdlPalette) {
+			p_textureInfo->m_surface->Unlock(desc.lpSurface);
 			MORTAR_DestroySurface(surface);
 			return false;
 		}
@@ -78,6 +79,7 @@ bool TextureLoader::PatchTexture(LegoTextureInfo* p_textureInfo)
 
 		LPDIRECTDRAWPALETTE ddPalette = nullptr;
 		if (pDirectDraw->CreatePalette(DDPCAPS_8BIT | DDPCAPS_ALLOW256, entries, &ddPalette, NULL) != DD_OK) {
+			p_textureInfo->m_surface->Unlock(desc.lpSurface);
 			MORTAR_DestroySurface(surface);
 			return false;
 		}