diff --git a/tasmota/tasmota_support/support.ino b/tasmota/tasmota_support/support.ino
index fb945953a..e6b85cd5c 100755
--- a/tasmota/tasmota_support/support.ino
+++ b/tasmota/tasmota_support/support.ino
@@ -2709,6 +2709,10 @@ String HtmlEscape(const String unescaped) {
   return result;
 }
 
+String SettingsTextEscaped(uint32_t index) {
+  return HtmlEscape(SettingsText(index));
+}
+
 String UrlEscape(const char *unescaped) {
   static const char *hex = "0123456789ABCDEF";
   String result;
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
index de9b796ba..b9837b786 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
@@ -477,10 +477,6 @@ static void WebGetArg(const char* arg, char* out, size_t max)
 //  out[max-1] = '\0';  // Ensure terminating NUL
 }
 
-String SettingsTextEscaped(uint32_t index) {
-  return HtmlEscape(SettingsText(index));
-}
-
 String AddWebCommand(const char* command, const char* arg, const char* dflt) {
 /*
   // OK but fixed max argument
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
index 58c6f691a..3ea6508ad 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_9_berry.ino
@@ -894,6 +894,7 @@ bool Xdrv52(uint32_t function)
         BrLoad("autoexec.be");   // run autoexec.be at first tick, so we know all modules are initialized
         berry.autoexec_done = true;
 
+#ifdef USE_WEBSERVER
         // check if `web_add_handler` was missed, for example because of Berry VM restart
         if (!berry.web_add_handler_done) {
           bool network_up = WifiHasIP();
@@ -905,6 +906,7 @@ bool Xdrv52(uint32_t function)
             berry.web_add_handler_done = true;
           }
         }
+#endif  // USE_WEBSERVER
       }
       if (TasmotaGlobal.berry_fast_loop_enabled) {    // call only if enabled at global level
         callBerryFastLoop(false);      // call `tasmota.fast_loop()` optimized for minimal performance impact
diff --git a/tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino b/tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino
index 82f10f0cf..5f0e3633e 100644
--- a/tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino
+++ b/tasmota/tasmota_xsns_sensor/xsns_60_GPS.ino
@@ -870,14 +870,14 @@ const char HTTP_SNS_GPS2[] PROGMEM = "{s}GPS " D_SPEED "{m}%2_f " D_UNIT_KILOMET
                                      "{s}GPS " D_HEADING_ACCURACY "{m}%1_f{e}";
 #endif  // USE_GPS_VELOCITY
 
-const char kGPSFix[] PROGMEM = D_SAT_FIX_NO_FIX "|" D_SAT_FIX_DEAD_RECK "|" D_SAT_FIX_2D "|" D_SAT_FIX_3D "|" D_SAT_FIX_GPS_DEAD "|" D_SAT_FIX_TIME;
-
 #ifdef USE_GPS_MAPS
 const char UBX_GOOGLE_MAPS[] ="<iframe width='100%%' src='https://maps.google.com/maps?width=&amp;height=&amp;hl=en&amp;q=%s %s+(Tasmota)&amp;ie=UTF8&amp;t=&amp;z=10&amp;iwloc=B&amp;output=embed' frameborder='0' scrolling='no' marginheight='0' marginwidth='0'></iframe>";
 #endif  // USE_GPS_MAPS
 
 #endif  // USE_WEBSERVER
 
+const char kGPSFix[] PROGMEM = D_SAT_FIX_NO_FIX "|" D_SAT_FIX_DEAD_RECK "|" D_SAT_FIX_2D "|" D_SAT_FIX_3D "|" D_SAT_FIX_GPS_DEAD "|" D_SAT_FIX_TIME;
+
 /********************************************************************************************/
 
 void UBXShow(bool json) {