diff --git a/esp32_marauder/GpsInterface.cpp b/esp32_marauder/GpsInterface.cpp
index 131253d..15840b6 100644
--- a/esp32_marauder/GpsInterface.cpp
+++ b/esp32_marauder/GpsInterface.cpp
@@ -32,7 +32,7 @@ void GpsInterface::begin() {
 
   MicroNMEA::sendSentence(Serial2, "$PSTMSRR");
 
-  delay(1900);
+  delay(1000);
 
   if (Serial2.available()) {
     Serial.println("GPS Attached Successfully");
diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 4fb80ee..d5f4f9a 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -150,7 +150,7 @@ extern "C" {
 
         AdvData_Raw[i++] = 0x03;  // Incomplete List of 16-bit Service UUIDs length
         AdvData_Raw[i++] = 0x02;  // Incomplete List of 16-bit Service UUIDs type
-        AdvData_Raw[i++] = 0x81;  // Service UUID (part of hex dump)
+        AdvData_Raw[i++] = 0x80 + (rand() % 3) + 1;   // Service UUID (part of hex dump)
         AdvData_Raw[i++] = 0x30;
 
         AdvData_Raw[i++] = 0x02;  // TX Power level length