diff --git a/src/ui/QGCHilConfiguration.cc b/src/ui/QGCHilConfiguration.cc
index ced0d796303386ecf09b17857e914632b5e8247d..c1e8e28bc56d95dc036dc727570bcc5e21703632 100644
--- a/src/ui/QGCHilConfiguration.cc
+++ b/src/ui/QGCHilConfiguration.cc
@@ -94,7 +94,7 @@ void QGCHilConfiguration::on_simComboBox_currentIndexChanged(int index)
         QGCFlightGearLink* fg = dynamic_cast<QGCFlightGearLink*>(_vehicle->uas()->getHILSimulation());
         if (fg)
         {
-            connect(fg, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString)));
+            connect(fg, &QGCFlightGearLink::statusMessage, ui->statusLabel, &QLabel::setText);
         }
 
     }
@@ -111,7 +111,7 @@ void QGCHilConfiguration::on_simComboBox_currentIndexChanged(int index)
         if (xplane)
         {
             xplane->setVersion((index == 2) ? 10 : 9);
-            connect(xplane, SIGNAL(statusMessage(QString)), ui->statusLabel, SLOT(setText(QString)));
+            connect(xplane, &QGCXPlaneLink::statusMessage, ui->statusLabel, &QLabel::setText);
         }
     }
 // Disabling JSB Sim since its not well maintained,
diff --git a/src/ui/QGCHilFlightGearConfiguration.cc b/src/ui/QGCHilFlightGearConfiguration.cc
index e7e3c24697ca1b95a1e29f615c1839600c7fcab3..fabee9d009c16ec9b6b9e59cb22e569c4fa14c9b 100644
--- a/src/ui/QGCHilFlightGearConfiguration.cc
+++ b/src/ui/QGCHilFlightGearConfiguration.cc
@@ -73,9 +73,10 @@ QGCHilFlightGearConfiguration::QGCHilFlightGearConfiguration(Vehicle* vehicle, Q
 
     // Provide an option on the context menu to reset the option back to default
     _ui.optionsPlainTextEdit->setContextMenuPolicy(Qt::CustomContextMenu);
-    bool success = connect(&_resetOptionsAction, SIGNAL(triggered()), this, SLOT(_setDefaultOptions()));
+    bool success = connect(&_resetOptionsAction, &QAction::triggered, this, &QGCHilFlightGearConfiguration::_setDefaultOptions);
     Q_ASSERT(success);
-    success = connect(_ui.optionsPlainTextEdit, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(_showContextMenu(const QPoint &)));
+    success = connect(_ui.optionsPlainTextEdit, &QPlainTextEdit::customContextMenuRequested,
+                      this, &QGCHilFlightGearConfiguration::_showContextMenu);
     Q_ASSERT(success);
     Q_UNUSED(success);  // Silence release build unused variable warning
 }
diff --git a/src/ui/QGCHilXPlaneConfiguration.cc b/src/ui/QGCHilXPlaneConfiguration.cc
index 9e1e015dfafa971d60906ebaf471586d9efbe202..e553ddb3c1df1b4e93e11a05dd11df13d5882e2b 100644
--- a/src/ui/QGCHilXPlaneConfiguration.cc
+++ b/src/ui/QGCHilXPlaneConfiguration.cc
@@ -1,18 +1,22 @@
 #include "QGCHilXPlaneConfiguration.h"
 #include "ui_QGCHilXPlaneConfiguration.h"
 #include "QGCXPlaneLink.h"
+#include "QGCHilConfiguration.h"
 
-QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink* link, QWidget *parent) :
+QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink* link, QGCHilConfiguration *parent) :
     QWidget(parent),
     ui(new Ui::QGCHilXPlaneConfiguration)
 {
     ui->setupUi(this);
     this->link = link;
 
-    connect(ui->startButton, SIGNAL(clicked(bool)), this, SLOT(toggleSimulation(bool)));
-    connect(ui->hostComboBox, SIGNAL(activated(QString)), link, SLOT(setRemoteHost(QString)));
-    connect(link, SIGNAL(remoteChanged(QString)), ui->hostComboBox, SLOT(setEditText(QString)));
-    connect(link, SIGNAL(statusMessage(QString)), parent, SLOT(receiveStatusMessage(QString)));
+    connect(ui->startButton, &QPushButton::clicked, this, &QGCHilXPlaneConfiguration::toggleSimulation);
+
+    connect(ui->hostComboBox, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::activated),
+            link, &QGCHilLink::setRemoteHost);
+
+    connect(link, &QGCHilLink::remoteChanged, ui->hostComboBox, &QComboBox::setEditText);
+    connect(link, &QGCHilLink::statusMessage, parent, &QGCHilConfiguration::receiveStatusMessage);
 
 //    connect(mav->getHILSimulation(), SIGNAL(statusMessage(QString)), this, SLOT(receiveStatusMessage(QString)));
 //    connect(ui->simComboBox, SIGNAL(activated(QString)), mav->getHILSimulation(), SLOT(setVersion(QString)));
diff --git a/src/ui/QGCHilXPlaneConfiguration.h b/src/ui/QGCHilXPlaneConfiguration.h
index 56de74cdc7cabd7ea35efc16f618ab74ed59ca15..e03e232d8630606abc9a2380f78e7bd9c74ae55d 100644
--- a/src/ui/QGCHilXPlaneConfiguration.h
+++ b/src/ui/QGCHilXPlaneConfiguration.h
@@ -5,6 +5,7 @@
 
 #include "QGCHilLink.h"
 
+class QGCHilConfiguration;
 namespace Ui {
 class QGCHilXPlaneConfiguration;
 }
@@ -14,7 +15,7 @@ class QGCHilXPlaneConfiguration : public QWidget
     Q_OBJECT
     
 public:
-    explicit QGCHilXPlaneConfiguration(QGCHilLink* link, QWidget *parent = 0);
+    explicit QGCHilXPlaneConfiguration(QGCHilLink* link, QGCHilConfiguration *parent = 0);
     ~QGCHilXPlaneConfiguration();
 
 public slots: