diff --git a/BizHawk.MultiClient/Rewind.cs b/BizHawk.MultiClient/Rewind.cs
index 839f00aeb4..8527decdf7 100644
--- a/BizHawk.MultiClient/Rewind.cs
+++ b/BizHawk.MultiClient/Rewind.cs
@@ -22,7 +22,8 @@ namespace BizHawk.MultiClient
 					RewindImpossible = true;
 					LastState = null;
 					Global.OSD.AddMessage("Rewind Disabled: State too large.");
-					Global.OSD.AddMessage("See 'Arcade Card Rewind Hack' in Emulation->PC Engine options.");
+					if (Global.Emulator.SystemId == "PCE")
+						Global.OSD.AddMessage("See 'Arcade Card Rewind Hack' in Emulation->PC Engine options.");
 				}
 
 				return;
diff --git a/BizHawk.MultiClient/output/dll/libyabause.dll b/BizHawk.MultiClient/output/dll/libyabause.dll
index 634c9edfe0..1e27372ff7 100644
Binary files a/BizHawk.MultiClient/output/dll/libyabause.dll and b/BizHawk.MultiClient/output/dll/libyabause.dll differ
diff --git a/yabause/src/libyabause/yui.cpp b/yabause/src/libyabause/yui.cpp
index abafc87e98..38e3472de1 100644
--- a/yabause/src/libyabause/yui.cpp
+++ b/yabause/src/libyabause/yui.cpp
@@ -258,6 +258,8 @@ extern "C" __declspec(dllexport) int libyabause_init(CDInterface *_CD, const cha
 	DisableAutoFrameSkip();
 	ScspSetFrameAccurate(1);
 
+	OSDChangeCore(OSDCORE_DUMMY);
+
 	ctrl1 = PerPadAdd(&PORTDATA1);
 	ctrl2 = PerPadAdd(&PORTDATA2);