diff --git a/ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp b/ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp
index 73c495b34..6655351bb 100644
--- a/ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp
+++ b/ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp
@@ -292,11 +292,9 @@ void modelMapProxy::dataChanged(const QModelIndex &topLeft, const QModelIndex &b
 void modelMapProxy::rowsInserted(const QModelIndex &parent, int first, int last)
 {
     Q_UNUSED(parent);
-    Q_UNUSED(first);
-    Q_UNUSED(last);
 
-    /*
-       for (int x = first; x < last + 1; x++) {
+
+    for (int x = first; x < last + 1; x++) {
         QModelIndex index;
         WayPointItem *item;
         internals::PointLatLng latlng;
@@ -324,8 +322,8 @@ void modelMapProxy::rowsInserted(const QModelIndex &parent, int first, int last)
         } else {
             item = myMap->WPInsert(latlng, altitude, desc, x);
         }
-       }
-     */
+    }
+
     refreshOverlays();
 }
 void modelMapProxy::deleteWayPoint(int number)
diff --git a/shared/uavobjectdefinition/systemalarms.xml b/shared/uavobjectdefinition/systemalarms.xml
index d74ae5e02..d17877cd9 100644
--- a/shared/uavobjectdefinition/systemalarms.xml
+++ b/shared/uavobjectdefinition/systemalarms.xml
@@ -43,8 +43,8 @@
 		</elementnames>
 	</field>
         <access gcs="readwrite" flight="readwrite"/>
-        <telemetrygcs acked="true" updatemode="onchange" period="0"/>
-        <telemetryflight acked="true" updatemode="onchange" period="0"/>
+        <telemetrygcs acked="true" updatemode="manual" period="0"/>
+        <telemetryflight acked="true" updatemode="throttled" period="100"/>
 	<logging updatemode="manual" period="0"/>
     </object>
 </xml>