diff --git a/output/dll/faust.wbx.gz b/output/dll/faust.wbx.gz
index 92a221b31c..49a92c5073 100644
Binary files a/output/dll/faust.wbx.gz and b/output/dll/faust.wbx.gz differ
diff --git a/output/dll/hyper.wbx.gz b/output/dll/hyper.wbx.gz
index 88b3e130b0..44b4d62806 100644
Binary files a/output/dll/hyper.wbx.gz and b/output/dll/hyper.wbx.gz differ
diff --git a/output/dll/ngp.wbx.gz b/output/dll/ngp.wbx.gz
index 57fa429394..9ba4413704 100644
Binary files a/output/dll/ngp.wbx.gz and b/output/dll/ngp.wbx.gz differ
diff --git a/output/dll/pcfx.wbx.gz b/output/dll/pcfx.wbx.gz
index a9c9ab95a0..8f5ce553cd 100644
Binary files a/output/dll/pcfx.wbx.gz and b/output/dll/pcfx.wbx.gz differ
diff --git a/output/dll/ss.wbx.gz b/output/dll/ss.wbx.gz
index ef9ba4b2f6..613c0ebc82 100644
Binary files a/output/dll/ss.wbx.gz and b/output/dll/ss.wbx.gz differ
diff --git a/output/dll/turbo.wbx.gz b/output/dll/turbo.wbx.gz
index 0d92d5176e..cfe81d322e 100644
Binary files a/output/dll/turbo.wbx.gz and b/output/dll/turbo.wbx.gz differ
diff --git a/waterbox/make-all-cores.sh b/waterbox/make-all-cores.sh
index ce18fd31ac..e43ea80408 100644
--- a/waterbox/make-all-cores.sh
+++ b/waterbox/make-all-cores.sh
@@ -10,12 +10,4 @@ cd sameboy && make -f Makefile $1 -j && cd -
 cd snes9x && make -f Makefile $1 -j && cd -
 cd uzem && make -f Makefile $1 -j && cd -
 cd vb && make -f Makefile $1 -j && cd -
-cd nyma && make -f faust.mak $1 -j && cd -
-cd nyma && make -f hyper.mak $1 -j && cd -
-#cd nyma && make -f lynx.mak $1 -j && cd -
-cd nyma && make -f ngp.mak $1 -j && cd -
-cd nyma && make -f pcfx.mak $1 -j && cd -
-cd nyma && make -f ss.mak $1 -j && cd -
-cd nyma && make -f turbo.mak $1 -j && cd -
-#cd nyma && make -f vb.mak $1 -j && cd -
-#cd nyma && make -f wswan.mak $1 -j && cd -
+cd nyma && ./make-all-released-cores.sh $1 && cd -
diff --git a/waterbox/nyma/NymaCore.cpp b/waterbox/nyma/NymaCore.cpp
index 7c7ce85c07..3dd8117113 100644
--- a/waterbox/nyma/NymaCore.cpp
+++ b/waterbox/nyma/NymaCore.cpp
@@ -45,13 +45,14 @@ static void Setup()
 	);
 	EES = new EmulateSpecStruct();
 	EES->surface = Surf;
-	EES->VideoFormatChanged = true;
 	EES->LineWidths = new int32_t[Game->fb_height];
 	memset(EES->LineWidths, 0xff, Game->fb_height * sizeof(int32_t));
 	EES->SoundBuf = samples;
 	EES->SoundBufMaxSize = 22050;
-	EES->SoundFormatChanged = true;
 	EES->SoundRate = 44100;
+
+	if (Game->FormatsChanged)
+		Game->FormatsChanged(EES);
 }
 
 ECL_EXPORT bool InitRom(const InitData& data)
@@ -141,8 +142,6 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo& frame)
 		Game->TransformInput();
 	Game->Emulate(EES);
 
-	EES->VideoFormatChanged = false;
-	EES->SoundFormatChanged = false;
 	frame.Cycles = EES->MasterCycles;
 	frame.Lagged = LagFlag;
 	if (!(frame.BizhawkFlags & BizhawkFlags::SkipSoundening))
diff --git a/waterbox/nyma/make-all-released-cores.sh b/waterbox/nyma/make-all-released-cores.sh
new file mode 100644
index 0000000000..30a8ab6393
--- /dev/null
+++ b/waterbox/nyma/make-all-released-cores.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+make -f turbo.mak $1 -j
+make -f hyper.mak $1 -j
+make -f ngp.mak $1 -j
+make -f faust.mak $1 -j
+make -f pcfx.mak $1 -j
+make -f ss.mak $1 -j
+# make -f lynx.mak $1 -j
+# make -f vb.mak $1 -j
+# make -f wswan.mak $1 -j
diff --git a/waterbox/nyma/mednafen b/waterbox/nyma/mednafen
index 29a9e805ed..f8f03f67a9 160000
--- a/waterbox/nyma/mednafen
+++ b/waterbox/nyma/mednafen
@@ -1 +1 @@
-Subproject commit 29a9e805edba65e0f2f62403b1d56d64b295ae65
+Subproject commit f8f03f67a9d3b4edd42ee817350699dbcd90eef4
diff --git a/waterbox/nyma/rebuild-all-released-cores.sh b/waterbox/nyma/rebuild-all-released-cores.sh
deleted file mode 100644
index 718845e2f1..0000000000
--- a/waterbox/nyma/rebuild-all-released-cores.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-make -f turbo.mak install -j
-make -f hyper.mak install -j
-make -f ngp.mak install -j
-make -f faust.mak install -j
-make -f pcfx.mak install -j
-make -f ss.mak install -j
diff --git a/waterbox/waterbox-Makefile.all b/waterbox/waterbox-Makefile.all
deleted file mode 100644
index 28bf584fa2..0000000000
--- a/waterbox/waterbox-Makefile.all
+++ /dev/null
@@ -1,17 +0,0 @@
-# in case we have libs that need to build before cores, I split this up into two parts
-LIBS = emulibc libco
-CORES = gpgx libsnes pcfx vb ngp picodrive sameboy ss uzem
-
-default: all
-
-FORCE:
-
-$(CORES) : FORCE $(LIBS)
-	make -C $@ $(MAKECMDGOALS)
-
-$(LIBS) ::
-	make -C $@ $(MAKECMDGOALS)
-
-
-all clean : $(CORES)
-