diff --git a/src/SeerConfigDialog.cpp b/src/SeerConfigDialog.cpp
index 8deaa16..aa4521e 100644
--- a/src/SeerConfigDialog.cpp
+++ b/src/SeerConfigDialog.cpp
@@ -507,8 +507,6 @@ QString SeerConfigDialog::rrGdbArguments () const {
 
 void SeerConfigDialog::handleChangePage(QListWidgetItem* current, QListWidgetItem* previous) {
 
-    //qDebug() << current << previous;
-
     if (!current) {
         current = previous;
     }
diff --git a/src/SeerGdbWidget.cpp b/src/SeerGdbWidget.cpp
index 1e679b8..62a11ee 100644
--- a/src/SeerGdbWidget.cpp
+++ b/src/SeerGdbWidget.cpp
@@ -3091,8 +3091,8 @@ bool SeerGdbWidget::startGdb () {
 
     QString expandedarguments = Seer::expandEnv(rawarguments, &ok);
 
-    qDebug() << "Raw arguments     : " << rawarguments;
-    qDebug() << "Expanded arguments: " << expandedarguments;
+    //qDebug() << "Raw arguments     : " << rawarguments;
+    //qDebug() << "Expanded arguments: " << expandedarguments;
 
     if (ok == false) {
 
@@ -3142,14 +3142,14 @@ bool SeerGdbWidget::startGdbRR () {
 
     // Set the gdb program name to use.
     QString command   = rrProgram();
-    QString arguments = "replay --interpreter=mi --tty " + _consoleWidget->ttyDeviceName() + " " + executableRRTraceDirectory();
+    QString arguments = rrArguments() + " --tty " + _consoleWidget->ttyDeviceName() + " " + executableRRTraceDirectory();
 
     if (rrGdbArguments() != "") {
         arguments += " -- " + rrGdbArguments();
     }
 
     // Split string into words, handling "double quoted" words.
-    QStringList args = Seer::split(expandedarguments);
+    QStringList args = Seer::split(arguments);
 
     //qDebug() << "Expanded command: "   << command;
     //qDebug() << "Expanded arguments: " << arguments;
diff --git a/src/SeerKeysConfigPage.cpp b/src/SeerKeysConfigPage.cpp
index 13699ad..bc0177c 100644
--- a/src/SeerKeysConfigPage.cpp
+++ b/src/SeerKeysConfigPage.cpp
@@ -12,7 +12,7 @@ SeerKeysConfigPage::SeerKeysConfigPage(QWidget* parent) : QWidget(parent) {
     // Connect things.
 
     // Setup the widgets
-    setKeySettings(SeerKeySettings::populate());
+    reset();
 }
 
 SeerKeysConfigPage::~SeerKeysConfigPage() {
@@ -57,14 +57,6 @@ SeerKeySettings SeerKeysConfigPage::keySettings() const {
 
     SeerKeySettings settings;
 
-    if (keysTableWidget->rowCount() == 0) {
-        return settings;
-    }
-
-    if (keysTableWidget->columnCount() == 2) {
-        return settings;
-    }
-
     for (int r=0; r<keysTableWidget->rowCount(); r++) {
 
         // Get the key (label) for this row.
diff --git a/src/SeerMainWindow.cpp b/src/SeerMainWindow.cpp
index c707b1b..01585a0 100644
--- a/src/SeerMainWindow.cpp
+++ b/src/SeerMainWindow.cpp
@@ -692,6 +692,9 @@ void SeerMainWindow::handleSettingsConfiguration () {
     dlg.setAssemblyRegisterFormat(gdbWidget->assemblyRegisterFormat());
     dlg.setAssemblyDisassemblyMode(gdbWidget->assemblyDisassemblyMode(), gdbWidget->assemblyDisassemblyBytes());
     dlg.setKeySettings(keySettings());
+    dlg.setRRProgram(gdbWidget->rrProgram());
+    dlg.setRRArguments(gdbWidget->rrArguments());
+    dlg.setRRGdbArguments(gdbWidget->rrGdbArguments());
 
     int ret = dlg.exec();
 
@@ -1358,7 +1361,7 @@ void SeerMainWindow::readConfigSettings () {
     settings.beginGroup("rr"); {
         gdbWidget->setRRProgram(settings.value("program", "/usr/bin/rr").toString());
         gdbWidget->setRRArguments(settings.value("arguments", "replay --interpreter=mi").toString());
-        gdbWidget->setRRArguments(settings.value("gdbarguments", "").toString());
+        gdbWidget->setRRGdbArguments(settings.value("gdbarguments", "").toString());
     } settings.endGroup();
 
     settings.beginGroup("printpoints"); {