diff --git a/src/uas/QGCUASParamManager.cc b/src/uas/QGCUASParamManager.cc
index 90991f899d9b663969c64434aafc31607f9ac502..c4d81c77617f0a64ff473af6b22fe5ce2f427044 100644
--- a/src/uas/QGCUASParamManager.cc
+++ b/src/uas/QGCUASParamManager.cc
@@ -24,6 +24,7 @@ QGCUASParamManager* QGCUASParamManager::initWithUAS(UASInterface* uas)
     // Load default values and tooltips for data model
     loadParamMetaInfoCSV();
 
+    paramDataModel.setUASID(mav->getUASID());
     paramCommsMgr = new UASParameterCommsMgr(this);
     paramCommsMgr->initWithUAS(uas);
 
diff --git a/src/uas/UASParameterCommsMgr.cc b/src/uas/UASParameterCommsMgr.cc
index d33eed747a74f7c40c35ffaace64cf096b5adcd8..126a6910fc072d2ccb993b866174fd36b19b4aa5 100644
--- a/src/uas/UASParameterCommsMgr.cc
+++ b/src/uas/UASParameterCommsMgr.cc
@@ -253,6 +253,8 @@ void UASParameterCommsMgr::silenceTimerExpired()
         qDebug() << "maxSilenceTimeout exceeded: " << totalElapsed;
         int missingReads, missingWrites;
         clearRetransmissionLists(missingReads,missingWrites);
+        silenceTimer.stop();
+        lastSilenceTimerReset = curTime;
         setParameterStatusMsg(tr("TIMEOUT: Abandoning %1 reads %2 writes after %3 seconds").arg(missingReads).arg(missingWrites).arg(totalElapsed/1000));
     }
     else {
diff --git a/src/uas/UASParameterDataModel.cc b/src/uas/UASParameterDataModel.cc
index 0a16a3ad652aa5e123d87e163253513fdeb6330a..80b7f70a7c72dc0a26779268904378c3ad59c85f 100644
--- a/src/uas/UASParameterDataModel.cc
+++ b/src/uas/UASParameterDataModel.cc
@@ -264,13 +264,13 @@ void UASParameterDataModel::readUpdateParamsFromStream( QTextStream& stream)
             if (wpParams.size() == 5) {
                 // Only load parameters for right mav
                 if (!userWarned && (uasId != lineMavId)) {
-                    //TODO warn the user somehow ??
+                    //TODO warn the user somehow ?? Appears these are saved currently with mav ID 0 but mav ID is often nonzero?
                     QString msg = tr("The parameters in the stream have been saved from system %1, but the currently selected system has the ID %2.").arg(lineMavId).arg(uasId);
-//                    MainWindow::instance()->showCriticalMessage(
-//                                tr("Parameter loading warning"),
-//                                tr("The parameters from the file %1 have been saved from system %2, but the currently selected system has the ID %3. If this is unintentional, please click on <READ> to revert to the parameters that are currently onboard").arg(fileName).arg(wpParams.at(0).toInt()).arg(mav->getUASID()));
+                    qWarning() << msg ;
+                    //MainWindow::instance()->showCriticalMessage(
+                    //            tr("Parameter loading warning"),
+                    //            tr("The parameters from the file %1 have been saved from system %2, but the currently selected system has the ID %3. If this is unintentional, please click on <READ> to revert to the parameters that are currently onboard").arg(fileName).arg(wpParams.at(0).toInt()).arg(mav->getUASID()));
                     userWarned = true;
-                    return;
                 }
 
                 bool changed = false;
@@ -286,8 +286,9 @@ void UASParameterDataModel::readUpdateParamsFromStream( QTextStream& stream)
                     changed = true;
                 }
                 else {
-                    if (fabs((static_cast<float>(onboardParameters.value(componentId)->value(key, dblVal).toDouble())) - (dblVal)) >
-                            2.0f * FLT_EPSILON) {
+                    QMap<QString,QVariant>* compParams = onboardParameters.value(componentId);
+                    if (!compParams->contains(key) ||
+                        (fabs((static_cast<float>(compParams->value(key).toDouble())) - (dblVal)) > 2.0f * FLT_EPSILON)) {
                             changed = true;
                             qDebug() << "Changed" << key << "VAL" << dblVal;
                        }