diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index 11243c666..d459029c1 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -165,7 +165,7 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
 
     case EventMode::kEditMode:
       // Edit mode events are always set because they are not saved
-      for(const auto& item : FixedEditMapping)
+      for(const auto& item: FixedEditMapping)
         setDefaultKey(item, event, EventMode::kEditMode);
       break;
 
@@ -661,7 +661,6 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultMenuM
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::FixedEditMapping = {
-// TOOD: check MacOS mappings
   {Event::MoveLeftChar,             KBDK_LEFT},
   {Event::MoveRightChar,            KBDK_RIGHT},
   {Event::SelectLeftChar,           KBDK_LEFT, KBDM_SHIFT},
@@ -687,7 +686,7 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::FixedEditMap
   {Event::Delete,                   KBDK_DELETE},
   {Event::DeleteChar,               KBDK_D, KBDM_CTRL},
   {Event::DeleteWord,               KBDK_W, KBDM_CTRL},
-  {Event::DeleteWord,               KBDK_BACKSPACE, KBDM_CTRL},
+  {Event::DeleteWord,               KBDK_BACKSPACE, OPTION},
   {Event::DeleteHome,               KBDK_U, KBDM_CTRL},
   {Event::DeleteHome,               KBDK_BACKSPACE, CMD},
   {Event::DeleteEnd,                KBDK_K, KBDM_CTRL},
@@ -711,8 +710,11 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::FixedEditMap
   {Event::Delete,                   KBDK_DELETE},
   {Event::Delete,                   KBDK_KP_PERIOD},
   {Event::DeleteChar,               KBDK_D, KBDM_CTRL},
+  {Event::DeleteWord,               KBDK_BACKSPACE, KBDM_CTRL},
   {Event::DeleteWord,               KBDK_W, KBDM_CTRL},
+  {Event::DeleteHome,               KBDK_HOME, KBDM_CTRL},
   {Event::DeleteHome,               KBDK_U, KBDM_CTRL},
+  {Event::DeleteEnd,                KBDK_END, KBDM_CTRL},
   {Event::DeleteEnd,                KBDK_K, KBDM_CTRL},
   {Event::Backspace,                KBDK_BACKSPACE},
   {Event::Undo,                     KBDK_Z, KBDM_CTRL},
diff --git a/src/common/PKeyboardHandler.hxx b/src/common/PKeyboardHandler.hxx
index 8ebfd5acb..f00608b28 100644
--- a/src/common/PKeyboardHandler.hxx
+++ b/src/common/PKeyboardHandler.hxx
@@ -106,6 +106,7 @@ class PhysicalKeyboardHandler
     void enableMappings(const Event::EventSet& events, EventMode mode);
     void enableMapping(const Event::Type event, EventMode mode);
 
+  private:
     OSystem& myOSystem;
     EventHandler& myHandler;
 
diff --git a/src/gui/EditableWidget.cxx b/src/gui/EditableWidget.cxx
index 05cf74887..6f5db0f29 100644
--- a/src/gui/EditableWidget.cxx
+++ b/src/gui/EditableWidget.cxx
@@ -62,6 +62,7 @@ void EditableWidget::setText(const string& str, bool)
 
   setDirty();
 }
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void EditableWidget::setEditable(bool editable, bool hiliteBG)
 {
@@ -608,7 +609,6 @@ int EditableWidget::selectEndPos()
     return _caretPos;
 }
 
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool EditableWidget::killSelectedText(bool addEdit)
 {
diff --git a/src/gui/UndoHandler.cxx b/src/gui/UndoHandler.cxx
index 92dd4d2d8..f8eeb0c48 100644
--- a/src/gui/UndoHandler.cxx
+++ b/src/gui/UndoHandler.cxx
@@ -103,4 +103,4 @@ uInt32 UndoHandler::lastDiff(const string& text, const string& oldText) const
     pos--;
   }
   return uInt32(pos);
-}
\ No newline at end of file
+}