diff --git a/src/engine/platform/ay.h b/src/engine/platform/ay.h
index 23f68e8dc..04fff3d71 100644
--- a/src/engine/platform/ay.h
+++ b/src/engine/platform/ay.h
@@ -65,7 +65,7 @@ class DivPlatformAY8910: public DivDispatch {
 
       struct DAC {
         int sample, rate, period, pos, out;
-        bool furnaceDAC, setPos;
+        bool setPos;
 
         DAC():
           sample(-1),
@@ -73,7 +73,6 @@ class DivPlatformAY8910: public DivDispatch {
           period(0),
           pos(0),
           out(0),
-          furnaceDAC(false),
           setPos(false) {}
       } dac;
 
diff --git a/src/engine/platform/ay8930.h b/src/engine/platform/ay8930.h
index 230f63f84..6e8fc61fc 100644
--- a/src/engine/platform/ay8930.h
+++ b/src/engine/platform/ay8930.h
@@ -65,7 +65,7 @@ class DivPlatformAY8930: public DivDispatch {
 
       struct DAC {
         int sample, rate, period, pos, out;
-        bool furnaceDAC, setPos;
+        bool setPos;
 
         DAC():
           sample(-1),
@@ -73,7 +73,6 @@ class DivPlatformAY8930: public DivDispatch {
           period(0),
           pos(0),
           out(0),
-          furnaceDAC(false),
           setPos(false) {}
       } dac;
 
diff --git a/src/engine/platform/fmshared_OPN.h b/src/engine/platform/fmshared_OPN.h
index 2b301dd6a..ca3542b40 100644
--- a/src/engine/platform/fmshared_OPN.h
+++ b/src/engine/platform/fmshared_OPN.h
@@ -120,7 +120,6 @@ class DivPlatformOPN: public DivPlatformFMBase {
 
     struct OPNChannel: public FMChannel {
       unsigned char psgMode, autoEnvNum, autoEnvDen;
-      bool furnacePCM;
       int sample, macroVolMul;
 
       OPNChannel():
@@ -128,7 +127,6 @@ class DivPlatformOPN: public DivPlatformFMBase {
         psgMode(1),
         autoEnvNum(0),
         autoEnvDen(0),
-        furnacePCM(false),
         sample(-1),
         macroVolMul(255) {}
     };
diff --git a/src/engine/platform/genesis.h b/src/engine/platform/genesis.h
index 5293ef4df..ffb5186fb 100644
--- a/src/engine/platform/genesis.h
+++ b/src/engine/platform/genesis.h
@@ -37,7 +37,6 @@ class DivPlatformGenesis: public DivPlatformOPN {
     };
 
     struct Channel: public FMChannelStereo {
-      bool furnaceDac;
       bool dacMode;
       int dacPeriod;
       int dacRate;
@@ -49,7 +48,6 @@ class DivPlatformGenesis: public DivPlatformOPN {
       signed char dacOutput;
       Channel():
         FMChannelStereo(),
-        furnaceDac(false),
         dacMode(false),
         dacPeriod(0),
         dacRate(0),
diff --git a/src/engine/platform/mmc5.h b/src/engine/platform/mmc5.h
index 574f0684c..54669a953 100644
--- a/src/engine/platform/mmc5.h
+++ b/src/engine/platform/mmc5.h
@@ -26,14 +26,13 @@ class DivPlatformMMC5: public DivDispatch {
   struct Channel: public SharedChannel<signed char> {
     int prevFreq;
     unsigned char duty, sweep;
-    bool sweepChanged, furnaceDac, setPos;
+    bool sweepChanged, setPos;
     Channel():
       SharedChannel<signed char>(15),
       prevFreq(65535),
       duty(0),
       sweep(8),
       sweepChanged(false),
-      furnaceDac(false),
       setPos(false) {}
   };
   Channel chan[5];
diff --git a/src/gui/newFilePicker.cpp b/src/gui/newFilePicker.cpp
index 517a74d47..b017d8d9c 100644
--- a/src/gui/newFilePicker.cpp
+++ b/src/gui/newFilePicker.cpp
@@ -1603,7 +1603,7 @@ bool FurnaceFilePicker::draw(ImGuiWindowFlags winFlags) {
     }
 
     // OK/Cancel buttons
-    ImGui::BeginDisabled(entryName.empty() && chosenEntries.empty());
+    ImGui::BeginDisabled(entryName.empty() && chosenEntries.empty() && !dirSelect);
     if (ImGui::Button(_("OK"))) {
       // accept entry
       acknowledged=true;