diff --git a/src/engine/engine.h b/src/engine/engine.h
index 4e3d6b6c7..f2187faf3 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -54,8 +54,8 @@ class DivWorkPool;
 
 #define DIV_UNSTABLE
 
-#define DIV_VERSION "dev230"
-#define DIV_ENGINE_VERSION 230
+#define DIV_VERSION "dev231"
+#define DIV_ENGINE_VERSION 231
 // for imports
 #define DIV_VERSION_MOD 0xff01
 #define DIV_VERSION_FC 0xff02
diff --git a/src/engine/fileOps/fur.cpp b/src/engine/fileOps/fur.cpp
index c8ace42c9..2193c0510 100644
--- a/src/engine/fileOps/fur.cpp
+++ b/src/engine/fileOps/fur.cpp
@@ -2126,6 +2126,21 @@ bool DivEngine::loadFur(unsigned char* file, size_t len, int variantID) {
       }
     }
 
+    // YM2612 chip type
+    if (ds.version<231) {
+      for (int i=0; i<ds.systemLen; i++) {
+        if (ds.system[i]==DIV_SYSTEM_YM2612 ||
+            ds.system[i]==DIV_SYSTEM_YM2612_EXT ||
+            ds.system[i]==DIV_SYSTEM_YM2612_EXT ||
+            ds.system[i]==DIV_SYSTEM_YM2612_DUALPCM ||
+            ds.system[i]==DIV_SYSTEM_YM2612_DUALPCM_EXT ||
+            ds.system[i]==DIV_SYSTEM_YM2612_CSM) {
+          if (!ds.systemFlags[i].has("chipType") && !ds.systemFlags[i].has("ladderEffect")) {
+            ds.systemFlags[i].set("chipType",0);
+          }
+        }
+      }
+    }
 
     if (active) quitDispatch();
     BUSY_BEGIN_SOFT;
diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp
index 1215b4a61..76141d2cf 100644
--- a/src/engine/platform/genesis.cpp
+++ b/src/engine/platform/genesis.cpp
@@ -1857,9 +1857,11 @@ void DivPlatformGenesis::setFlags(const DivConfig& flags) {
       break;
   }
   if (flags.has("chipType")) {
-    chipType=flags.getInt("chipType",0);
-  } else {
+    chipType=flags.getInt("chipType",1);
+  } else if (flags.has("ladderEffect")) {
     chipType=flags.getBool("ladderEffect",false)?1:0;
+  } else {
+    chipType=1;
   }
   noExtMacros=flags.getBool("noExtMacros",false);
   fbAllOps=flags.getBool("fbAllOps",false);
diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index 1dc8e5dd1..92cca1a7b 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -3168,27 +3168,27 @@ void FurnaceGUI::initSystemPresets() {
   );
   ENTRY(
     _("Yamaha YM3438 (OPN2C)"), {
-      CH(DIV_SYSTEM_YM2612, 1.0f, 0, "")
+      CH(DIV_SYSTEM_YM2612, 1.0f, 0, "chipType=0")
     }
   );
     SUB_ENTRY(
       _("Yamaha YM3438 (extended channel 3)"), {
-        CH(DIV_SYSTEM_YM2612_EXT, 1.0f, 0, "")
+        CH(DIV_SYSTEM_YM2612_EXT, 1.0f, 0, "chipType=0")
       }
     );
     SUB_ENTRY(
       _("Yamaha YM3438 (OPN2C) CSM"), {
-        CH(DIV_SYSTEM_YM2612_CSM, 1.0f, 0, "")
+        CH(DIV_SYSTEM_YM2612_CSM, 1.0f, 0, "chipType=0")
       }
     );
     SUB_ENTRY(
       _("Yamaha YM3438 (OPN2C) with DualPCM"), {
-        CH(DIV_SYSTEM_YM2612_DUALPCM, 1.0f, 0, "")
+        CH(DIV_SYSTEM_YM2612_DUALPCM, 1.0f, 0, "chipType=0")
       }
     );
     SUB_ENTRY(
       _("Yamaha YM3438 (extended channel 3) with DualPCM"), {
-        CH(DIV_SYSTEM_YM2612_DUALPCM_EXT, 1.0f, 0, "")
+        CH(DIV_SYSTEM_YM2612_DUALPCM_EXT, 1.0f, 0, "chipType=0")
       }
     );
   ENTRY(
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 77121e641..39a84a242 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -1450,6 +1450,13 @@ void FurnaceGUI::drawSampleEdit() {
         }
       }
 
+      if (mobileUI) {
+        sameLineMaybe();
+        if (ImGui::Button(ICON_FA_ELLIPSIS_H "##SMobMenu")) {
+          ImGui::OpenPopup("SRightClick");
+        }
+      }
+
       ImGui::Separator();
 
       // time
diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp
index dee786b5f..b36e5f32a 100644
--- a/src/gui/sysConf.cpp
+++ b/src/gui/sysConf.cpp
@@ -36,10 +36,10 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
     case DIV_SYSTEM_YM2612_DUALPCM_EXT:
     case DIV_SYSTEM_YM2612_CSM: {
       int clockSel=flags.getInt("clockSel",0);
-      int chipType=0;
+      int chipType=1;
       if (flags.has("chipType")) {
-        chipType=flags.getInt("chipType",0);
-      } else {
+        chipType=flags.getInt("chipType",1);
+      } else if (flags.has("ladderEffect")) {
         chipType=flags.getBool("ladderEffect",0)?1:0;
       }
       int interruptSimCycles=flags.getInt("interruptSimCycles",0);
@@ -73,14 +73,14 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
 
       ImGui::Text(_("Chip type:"));
       ImGui::Indent();
-      if (ImGui::RadioButton(_("YM3438 (9-bit DAC)"),chipType==0)) {
-        chipType=0;
-        altered=true;
-      }
       if (ImGui::RadioButton(_("YM2612 (9-bit DAC with distortion)"),chipType==1)) {
         chipType=1;
         altered=true;
       }
+      if (ImGui::RadioButton(_("YM3438 (9-bit DAC)"),chipType==0)) {
+        chipType=0;
+        altered=true;
+      }
       if (ImGui::RadioButton(_("YMF276 (external DAC)"),chipType==2)) {
         chipType=2;
         altered=true;