diff --git a/src/uas/UAS.h b/src/uas/UAS.h
index fb83f832c7bfff8ea4e36b25719f10bf0cc8b71f..f80cb824cd472e72779b0cfe2261b06e382a11f8 100644
--- a/src/uas/UAS.h
+++ b/src/uas/UAS.h
@@ -388,16 +388,16 @@ public slots:
 signals:
 
     /** @brief The main/battery voltage has changed/was updated */
-    void voltageChanged(int uasId, double voltage);
+    //void voltageChanged(int uasId, double voltage); // Defined in UASInterface already
     /** @brief An actuator value has changed */
-    void actuatorChanged(UASInterface*, int actId, double value);
+    //void actuatorChanged(UASInterface*, int actId, double value); // Defined in UASInterface already
     /** @brief An actuator value has changed */
     void actuatorChanged(UASInterface* uas, QString actuatorName, double min, double max, double value);
     void motorChanged(UASInterface* uas, QString motorName, double min, double max, double value);
     /** @brief The system load (MCU/CPU usage) changed */
     void loadChanged(UASInterface* uas, double load);
     /** @brief Propagate a heartbeat received from the system */
-    void heartbeat(UASInterface* uas);
+    //void heartbeat(UASInterface* uas); // Defined in UASInterface already
     void imageStarted(quint64 timestamp);
     /** @brief A new camera image has arrived */
     void imageReady(UASInterface* uas);
diff --git a/src/ui/CommConfigurationWindow.cc b/src/ui/CommConfigurationWindow.cc
index 10d30ec0ec85a4be522293a48e3ee78657f71f00..b207dab3879f22cf2965968d5da8d19a2d28b16c 100644
--- a/src/ui/CommConfigurationWindow.cc
+++ b/src/ui/CommConfigurationWindow.cc
@@ -232,13 +232,6 @@ void CommConfigurationWindow::setLinkType(int linktype)
 				break;
 			}
 #endif // XBEELINK
-		case 0:
-			{
-				SerialLink *serial = new SerialLink();
-				tmpLink = serial;
-				MainWindow::instance()->addLink(tmpLink);
-				break;
-			}
 /*		case 1:
 			{
 				UDPLink *udp = new UDPLink();
@@ -258,7 +251,12 @@ void CommConfigurationWindow::setLinkType(int linktype)
 #endif // OPAL_RT
 		default:
 			{
-				MainWindow::instance()->addLink();
+			}
+		case 0:
+			{
+				SerialLink *serial = new SerialLink();
+				tmpLink = serial;
+				MainWindow::instance()->addLink(tmpLink);
 				break;
 			}
 	}