diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 3ffbb3c2c97e48074ef4aa8cc435097bd9600382..ab91e65df406d9209620400d803e4e9e57dc1144 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -163,7 +163,6 @@ DebuggerSettings *DebuggerSettings::instance()
     item->setText(tr("Operate by Instruction"));
     item->setCheckable(true);
     item->setDefaultValue(false);
-    item->setSettingsKey(debugModeGroup, QLatin1String("OperateByInstruction"));
     item->setIcon(QIcon(":/debugger/images/SingleInstructionMode.png"));
     item->setToolTip(tr("This switches the debugger to instruction-wise "
         "operation mode. In this mode, stepping operates on single "
diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index 2c59f5f37589425b95fed787cc2b03519cc1aca8..2a5d6ab8c06f600b40980b97dd931ee4f466d4a6 100644
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -1,7 +1,9 @@
 #include "debuggeruiswitcher.h"
 #include "debuggermainwindow.h"
+#include "debuggeractions.h"
+#include "debuggerconstants.h"
+#include "savedaction.h"
 
-#include <debugger/debuggerconstants.h>
 #include <utils/savedaction.h>
 #include <utils/styledbar.h>
 
@@ -117,10 +119,9 @@ DebuggerUISwitcher::~DebuggerUISwitcher()
     delete d;
 }
 
-void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &group)
 {
     d->m_debugMenu->addAction(command, group);
-    m_menuCommands.insert(m_languages.indexOf(langName), command);
+    m_menuCommands.insert(d->m_languages.indexOf(langName), command);
 }
 
 void DebuggerUISwitcher::setActiveLanguage(const QString &langName)