diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index d43190b06e4d696945104cb609801e1ceee656d1..7270ede46c340794621628b03ed6e1adb0f144b8 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -126,7 +126,8 @@ QGCViewDialog {
 
             QGCComboBox {
                 id:             factCombo
-                width:          valueField.width
+                anchors.left:   parent.left
+                anchors.right:  parent.right
                 visible:        _showCombo
                 model:          fact.enumStrings
 
diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index e014464d30c8f228eee59a8e923d4d30ad374818..e2fad94e2692f5e1195fd7f3a9061c5168e4debc 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -642,16 +642,15 @@ void LinkManager::_updateAutoConnectLinks(void)
     // Now remove all configs that are gone
     foreach (LinkConfiguration* pDeleteConfig, _confToDelete) {
         qCDebug(LinkManagerLog) << "Removing unused autoconnect config" << pDeleteConfig->name();
+        if (pDeleteConfig->link()) {
+            disconnectLink(pDeleteConfig->link());
+        }
         for (int i=0; i<_sharedAutoconnectConfigurations.count(); i++) {
             if (_sharedAutoconnectConfigurations[i].data() == pDeleteConfig) {
                 _sharedAutoconnectConfigurations.removeAt(i);
                 break;
             }
         }
-        if (pDeleteConfig->link()) {
-            disconnectLink(pDeleteConfig->link());
-        }
-        delete pDeleteConfig;
     }
 #endif
 #endif // NO_SERIAL_LINK