diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 6b0f64ff6..89f2d79b5 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -206,7 +206,7 @@ void GPS::publishUpdate()
 
         // Notify any status instances that are observing us
         const meshtastic::GPSStatus status =
-            meshtastic::GPSStatus(hasLock(), isConnected(), latitude, longitude, altitude, dop, heading, numSatellites);
+            meshtastic::GPSStatus(hasValidLocation, isConnected(), latitude, longitude, altitude, dop, heading, numSatellites);
         newStatus.notifyObservers(&status);
     }
 }
diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index c5e4481b6..b8d47ab8e 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -209,13 +209,13 @@ NodeInfo *MeshService::refreshMyNodeInfo()
     return node;
 }
 
-int MeshService::onGPSChanged(const meshtastic::GPSStatus *unused)
+int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
 {
     // Update our local node info with our position (even if we don't decide to update anyone else)
     NodeInfo *node = refreshMyNodeInfo();
     Position pos = node->position;
 
-    if (gps->hasLock()) {
+    if (newStatus->getHasLock()) {
         if (gps->altitude != 0)
             pos.altitude = gps->altitude;
         pos.latitude_i = gps->latitude;