diff --git a/src/common/PaletteHandler.hxx b/src/common/PaletteHandler.hxx
index 817c5fb5e..bd102d9f0 100644
--- a/src/common/PaletteHandler.hxx
+++ b/src/common/PaletteHandler.hxx
@@ -74,7 +74,7 @@ class PaletteHandler
       Increase or decrease given palette adjustable.
 
       @param adjustable  The adjustable to change
-      @param direction   +1 indicates increase, -1 indicates decrease.
+      @param direction  +1 indicates increase, -1 indicates decrease.
     */
     void changeAdjustable(int adjustable, int direction);
 
diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index 59c5cad32..1e796a0bd 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -373,7 +373,7 @@ void Console::setFormat(uInt32 format, bool force)
   {
     case 0:  // auto-detect
     {
-      if (myFormatAutodetected) return;
+      if (!force && myFormatAutodetected) return;
 
       myDisplayFormat = formatFromFilename();
       if (myDisplayFormat == "AUTO")
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 00f73f2be..fa87be91d 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -456,6 +456,9 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
         // Get (and display) the previous|next adjustment function,
         //  but do not change its value
         cycleAdjustSetting(adjustActive ? direction : 0)(0);
+        // Fallback message when no message is displayed by method
+        //if(!myOSystem.frameBuffer().messageShown())
+        //  myOSystem.frameBuffer().showMessage("Message " + std::to_string(int(myAdjustSetting)));
         myAdjustActive = true;
       }
       break;
diff --git a/src/gui/VideoAudioDialog.cxx b/src/gui/VideoAudioDialog.cxx
index 5d569014a..48fdcc8de 100644
--- a/src/gui/VideoAudioDialog.cxx
+++ b/src/gui/VideoAudioDialog.cxx
@@ -311,11 +311,11 @@ void VideoAudioDialog::addTVEffectsTab()
   CREATE_CUSTOM_SLIDERS(ScanIntense, "Intensity", kScanlinesChanged)
 
   // Create buttons in 2nd column
-  xpos = myTVSharp->getRight() + fontWidth * 2;
+  int cloneWidth = _font.getStringWidth("Clone Bad Adjust") + fontWidth * 2.5;
+  xpos = _w - HBORDER - 2 * 2 - cloneWidth;
   ypos = VBORDER - VGAP / 2;
 
   // Adjustable presets
-  int cloneWidth = _font.getStringWidth("Clone Bad Adjust") + fontWidth * 2.5;
 #define CREATE_CLONE_BUTTON(obj, desc)                                 \
   myClone ## obj =                                                     \
     new ButtonWidget(myTab, _font, xpos, ypos, cloneWidth, buttonHeight,\