diff --git a/Changes.txt b/Changes.txt
index 2fd89745e..623988cfb 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -25,7 +25,7 @@
 
   * Added 'Check for Update' button to Help dialog.
 
-  * Added different mask pattern for scanline emulation (TODO: doc)
+  * Added different mask pattern for scanline emulation
 
   * Fixed MindLink controller.
 
diff --git a/docs/index.html b/docs/index.html
index c9ff8a32d..73496e16c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1852,8 +1852,8 @@
 
     <tr>
       <td>Toggle <b><a href="#Debugger">Developer Settings</a></b> sets (player/developer)</td>
-      <td>Control + D</td>
-      <td>Control + D</td>
+      <td>Alt + D</td>
+      <td>Cmd + D</td>
     </tr>
 
     <tr>
diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index 33dc9e5b4..828291d37 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -627,13 +627,7 @@ PhysicalKeyboardHandler::DefaultCommonMapping = {
   { Event::ToggleAdaptRefresh,       KBDK_R, MOD3 },
   { Event::OverscanDecrease,         KBDK_PAGEDOWN, KBDM_SHIFT },
   { Event::OverscanIncrease,         KBDK_PAGEUP, KBDM_SHIFT },
-    //{Event::VidmodeStd,               KBDK_1, MOD3},
-    //{Event::VidmodeRGB,               KBDK_2, MOD3},
-    //{Event::VidmodeSVideo,            KBDK_3, MOD3},
-    //{Event::VidModeComposite,         KBDK_4, MOD3},
-    //{Event::VidModeBad,               KBDK_5, MOD3},
-    //{Event::VidModeCustom,            KBDK_6, MOD3},
-  { Event::PreviousVideoMode, KBDK_1, KBDM_SHIFT | MOD3 },
+  { Event::PreviousVideoMode,        KBDK_1, KBDM_SHIFT | MOD3 },
   { Event::NextVideoMode,            KBDK_1, MOD3 },
   { Event::PreviousAttribute,        KBDK_2, KBDM_SHIFT | MOD3 },
   { Event::NextAttribute,            KBDK_2, MOD3 },
@@ -682,7 +676,7 @@ PhysicalKeyboardHandler::DefaultCommonMapping = {
   { Event::ToggleTurbo,              KBDK_T, KBDM_CTRL },
   { Event::JitterDecrease,           KBDK_J, KBDM_SHIFT | KBDM_CTRL },
   { Event::JitterIncrease,           KBDK_J, KBDM_CTRL },
-  { Event::ToggleDeveloperSet,       KBDK_D, KBDM_CTRL },
+  { Event::ToggleDeveloperSet,       KBDK_D, MOD3 },
   { Event::ToggleJitter,             KBDK_J, MOD3 },
   { Event::ToggleFrameStats,         KBDK_L, MOD3 },
   { Event::ToggleTimeMachine,        KBDK_T, MOD3 },
diff --git a/src/gui/WhatsNewDialog.cxx b/src/gui/WhatsNewDialog.cxx
index 582f7b36e..8dd41479f 100644
--- a/src/gui/WhatsNewDialog.cxx
+++ b/src/gui/WhatsNewDialog.cxx
@@ -79,6 +79,7 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent,
   add(ypos, "added PlusROMs support for saving high scores");
   add(ypos, "added MovieCart support");
   add(ypos, "added weblinks for many games");
+  add(ypos, "added different mask pattern for scanline emulation");
   add(ypos, "debugger: added optional logging of breaks and traps");
   add(ypos, "debugger: enhanced prompt auto complete and history");
   add(ypos, "debugger: added Thumb cycle counting");
@@ -86,9 +87,10 @@ WhatsNewDialog::WhatsNewDialog(OSystem& osystem, DialogContainer& parent,
 #endif
 
   // Set needed dimensions
-  setSize(MAX_CHARS * fontWidth + HBORDER * 2,
-          ypos + VGAP * 2 + buttonHeight + VBORDER,
-          max_w, max_h);
+  ypos += VGAP * 2 + buttonHeight + VBORDER;
+  if(ypos > FBMinimum::Height) // minimal launcher height
+    throw runtime_error("ERROR: Too many entries in WhatsNewDialog!");
+  setSize(MAX_CHARS * fontWidth + HBORDER * 2, ypos, max_w, max_h);
 
   WidgetArray wid;
   addOKBGroup(wid, _font);