diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
index 00861c1..5bf5d08 100644
--- a/CONTRIBUTIONS.md
+++ b/CONTRIBUTIONS.md
@@ -35,7 +35,6 @@ Add yourself to the list,
 [donate with PayPal ↗️](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)!
 
 * Abdul Mannan Abbasi
-* Alex Maier
 * Andrea Ruffini Perico
 * Andrew Cox
 * Christoph Boss (@Kampfwurst)
diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index 1da0366..5e6cf0a 100644
--- a/accesslist-duplicates.capsman.rsc
+++ b/accesslist-duplicates.capsman.rsc
@@ -22,7 +22,7 @@
   :foreach AccList in=[ /caps-man/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
     :local Mac [ /caps-man/access-list/get $AccList mac-address ];
     :if ($Seen->$Mac = 1) do={
-      /caps-man/access-list/print without-paging where mac-address=$Mac;
+      /caps-man/access-list/print where mac-address=$Mac;
       :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
 
       :if ([ :typeof $Remove ] = "num") do={
diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc
index 03a9724..a6b4f41 100644
--- a/accesslist-duplicates.local.rsc
+++ b/accesslist-duplicates.local.rsc
@@ -22,7 +22,7 @@
   :foreach AccList in=[ /interface/wireless/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
     :local Mac [ /interface/wireless/access-list/get $AccList mac-address ];
     :if ($Seen->$Mac = 1) do={
-      /interface/wireless/access-list/print without-paging where mac-address=$Mac;
+      /interface/wireless/access-list/print where mac-address=$Mac;
       :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
 
       :if ([ :typeof $Remove ] = "num") do={
diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index bf23147..e51198d 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -27,9 +27,9 @@
     :local Mac [ /interface/wifi/access-list/get $AccList mac-address ];
     :local Mac [ /interface/wireless/access-list/get $AccList mac-address ];
     :if ($Seen->$Mac = 1) do={
-      /caps-man/access-list/print without-paging where mac-address=$Mac;
-      /interface/wifi/access-list/print without-paging where mac-address=$Mac;
-      /interface/wireless/access-list/print without-paging where mac-address=$Mac;
+      /caps-man/access-list/print where mac-address=$Mac;
+      /interface/wifi/access-list/print where mac-address=$Mac;
+      /interface/wireless/access-list/print where mac-address=$Mac;
       :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
 
       :if ([ :typeof $Remove ] = "num") do={
diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc
index 528a73c..cadacb6 100644
--- a/accesslist-duplicates.wifi.rsc
+++ b/accesslist-duplicates.wifi.rsc
@@ -22,7 +22,7 @@
   :foreach AccList in=[ /interface/wifi/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
     :local Mac [ /interface/wifi/access-list/get $AccList mac-address ];
     :if ($Seen->$Mac = 1) do={
-      /interface/wifi/access-list/print without-paging where mac-address=$Mac;
+      /interface/wifi/access-list/print where mac-address=$Mac;
       :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
 
       :if ([ :typeof $Remove ] = "num") do={
diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index 2ea1667..aaebf5c 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -4,7 +4,7 @@
 #                         Michael Gisbers <michael@gisbers.de>
 # https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.15
+# requires RouterOS, version=7.18
 #
 # download and cleanup packages for CAP installation from CAPsMAN
 # https://rsc.eworm.de/doc/capsman-download-packages.md
@@ -54,8 +54,8 @@
       "). Please place your packages!");
   }
 
-  :foreach Package in=[ /file/find where type="package" \
-        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+  :foreach Package in=[ /file/find recursive where path=$PackagePath \
+        type="package" package-version!=$InstalledVersion ] do={
     :local File [ /file/get $Package ];
     :if ($File->"package-architecture" = "mips") do={
       :set ($File->"package-architecture") "mipsbe";
@@ -67,7 +67,7 @@
     }
   }
 
-  :if ([ :len [ /file/find where type="package" name~("^" . $PackagePath) ] ] = 0) do={
+  :if ([ :len [ /file/find recursive where path=$PackagePath type="package" ] ] = 0) do={
     $LogPrint info $ScriptName ("No packages available, downloading default set.");
     :foreach Arch in={ "arm"; "mipsbe" } do={
       :foreach Package in={ "routeros"; "wireless" } do={
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index f95212a..ebbba70 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -4,7 +4,7 @@
 #                         Michael Gisbers <michael@gisbers.de>
 # https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.15
+# requires RouterOS, version=7.18
 #
 # download and cleanup packages for CAP installation from CAPsMAN
 # https://rsc.eworm.de/doc/capsman-download-packages.md
@@ -56,8 +56,8 @@
       "). Please place your packages!");
   }
 
-  :foreach Package in=[ /file/find where type="package" \
-        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+  :foreach Package in=[ /file/find recursive where path=$PackagePath \
+        type="package" package-version!=$InstalledVersion ] do={
     :local File [ /file/get $Package ];
     :if ($File->"package-architecture" = "mips") do={
       :set ($File->"package-architecture") "mipsbe";
@@ -69,7 +69,7 @@
     }
   }
 
-  :if ([ :len [ /file/find where type="package" name~("^" . $PackagePath) ] ] = 0) do={
+  :if ([ :len [ /file/find recursive where path=$PackagePath type="package" ] ] = 0) do={
     $LogPrint info $ScriptName ("No packages available, downloading default set.");
 # NOT /interface/wifi/ #
     :foreach Arch in={ "arm"; "mipsbe" } do={
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 03fd9e7..7de0431 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -4,7 +4,7 @@
 #                         Michael Gisbers <michael@gisbers.de>
 # https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.15
+# requires RouterOS, version=7.18
 #
 # download and cleanup packages for CAP installation from CAPsMAN
 # https://rsc.eworm.de/doc/capsman-download-packages.md
@@ -54,8 +54,8 @@
       "). Please place your packages!");
   }
 
-  :foreach Package in=[ /file/find where type="package" \
-        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+  :foreach Package in=[ /file/find recursive where path=$PackagePath \
+        type="package" package-version!=$InstalledVersion ] do={
     :local File [ /file/get $Package ];
     :if ($File->"package-architecture" = "mips") do={
       :set ($File->"package-architecture") "mipsbe";
@@ -67,7 +67,7 @@
     }
   }
 
-  :if ([ :len [ /file/find where type="package" name~("^" . $PackagePath) ] ] = 0) do={
+  :if ([ :len [ /file/find recursive where path=$PackagePath type="package" ] ] = 0) do={
     $LogPrint info $ScriptName ("No packages available, downloading default set.");
     :foreach Arch in={ "arm"; "arm64" } do={
       :local Packages { "arm"={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" };
diff --git a/check-health.d/state.rsc b/check-health.d/state.rsc
index 5e4cbb8..2991935 100644
--- a/check-health.d/state.rsc
+++ b/check-health.d/state.rsc
@@ -11,8 +11,7 @@
 :global CheckHealthPlugins;
 
 :set ($CheckHealthPlugins->[ :jobname ]) do={
-  :local FuncName   [ :tostr $0 ];
-  :local ScriptName [ :tostr $1 ];
+  :local FuncName [ :tostr $0 ];
 
   :global CheckHealthLast;
   :global Identity;
@@ -33,13 +32,13 @@
     :if ([ :typeof ($CheckHealthLast->$Name) ] != "nothing") do={
       :if ($CheckHealthLast->$Name = "ok" && \
            $Value != "ok") do={
-        $SendNotification2 ({ origin=$ScriptName; \
+        $SendNotification2 ({ origin=$FuncName; \
           subject=([ $SymbolForNotification "cross-mark" ] . "Health warning: " . $Name); \
           message=("The device '" . $Name . "' on " . $Identity . " failed!") });
       }
       :if ($CheckHealthLast->$Name != "ok" && \
            $Value = "ok") do={
-        $SendNotification2 ({ origin=$ScriptName; \
+        $SendNotification2 ({ origin=$FuncName; \
           subject=([ $SymbolForNotification "white-heavy-check-mark" ] . "Health recovery: " . $Name); \
           message=("The device '" . $Name . "' on " . $Identity . " recovered!") });
       }
diff --git a/check-health.d/temperature.rsc b/check-health.d/temperature.rsc
index 9f3f1a5..a2f632d 100644
--- a/check-health.d/temperature.rsc
+++ b/check-health.d/temperature.rsc
@@ -11,8 +11,7 @@
 :global CheckHealthPlugins;
 
 :set ($CheckHealthPlugins->[ :jobname ]) do={
-  :local FuncName   [ :tostr $0 ];
-  :local ScriptName [ :tostr $1 ];
+  :local FuncName [ :tostr $0 ];
 
   :global CheckHealthLast;
   :global CheckHealthTemperature;
@@ -55,7 +54,7 @@
       }
       :if ($Value > $CheckHealthTemperature->$Name && \
            $CheckHealthTemperatureNotified->$Name != true) do={
-        $SendNotification2 ({ origin=$ScriptName; \
+        $SendNotification2 ({ origin=$FuncName; \
           subject=([ $SymbolForNotification "fire" ] . "Health warning: " . $Name); \
           message=("The " . $Name . " on " . $Identity . " is above threshold: " . \
             $Value . "\C2\B0" . "C") });
@@ -63,7 +62,7 @@
       }
       :if ($Value <= ($CheckHealthTemperature->$Name - $CheckHealthTemperatureDeviation) && \
            $CheckHealthTemperatureNotified->$Name = true) do={
-        $SendNotification2 ({ origin=$ScriptName; \
+        $SendNotification2 ({ origin=$FuncName; \
           subject=([ $SymbolForNotification "white-heavy-check-mark" ] . "Health recovery: " . $Name); \
           message=("The " . $Name . " on " . $Identity . " dropped below threshold: " .  \
             $Value . "\C2\B0" . "C") });
diff --git a/check-health.d/voltage.rsc b/check-health.d/voltage.rsc
index 5891fb4..9071c88 100644
--- a/check-health.d/voltage.rsc
+++ b/check-health.d/voltage.rsc
@@ -11,8 +11,7 @@
 :global CheckHealthPlugins;
 
 :set ($CheckHealthPlugins->[ :jobname ]) do={
-  :local FuncName   [ :tostr $0 ];
-  :local ScriptName [ :tostr $1 ];
+  :local FuncName [ :tostr $0 ];
 
   :global CheckHealthLast;
   :global CheckHealthVoltageLow;
@@ -40,7 +39,7 @@
 
       :if ($NumLast * (100 + $CheckHealthVoltagePercent) < $NumCurr * 100 || \
            $NumLast * 100 > $NumCurr * (100 + $CheckHealthVoltagePercent)) do={
-        $SendNotification2 ({ origin=$ScriptName; \
+        $SendNotification2 ({ origin=$FuncName; \
           subject=([ $SymbolForNotification ("high-voltage-sign,chart-" . [ $IfThenElse ($NumLast < \
             $NumCurr) "in" "de" ] . "creasing") ] . "Health warning: " . $Name); \
           message=("The " . $Name . " on " . $Identity . " jumped more than " . $CheckHealthVoltagePercent . "%.\n\n" . \
@@ -48,12 +47,12 @@
             [ $FormatLine "new value" ($Value . " V") 12 ]) });
       } else={ 
         :if ($NumCurr <= $CheckHealthVoltageLow && $NumLast > $CheckHealthVoltageLow) do={ 
-          $SendNotification2 ({ origin=$ScriptName; \
+          $SendNotification2 ({ origin=$FuncName; \
             subject=([ $SymbolForNotification "high-voltage-sign,chart-decreasing" ] . "Health warning: Low " . $Name); \ 
             message=("The " . $Name . " on " . $Identity . " dropped to " . $Value . " V below hard limit.") }); 
         } 
         :if ($NumCurr > $CheckHealthVoltageLow && $NumLast <= $CheckHealthVoltageLow) do={ 
-          $SendNotification2 ({ origin=$ScriptName; \
+          $SendNotification2 ({ origin=$FuncName; \
             subject=([ $SymbolForNotification "high-voltage-sign,chart-increasing" ] . "Health recovery: Low " . $Name); \ 
             message=("The " . $Name . " on " . $Identity . " recovered to " . $Value . " V above hard limit.") }); 
         }
diff --git a/check-health.rsc b/check-health.rsc
index 760636d..4cb9940 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -92,16 +92,16 @@
       :onerror Err {
         /system/script/run $Plugin;
       } do={
-        $LogPrint error $ScriptName ("Plugin '" . $PluginVal->"name" . "' failed to run: " . $Err);
+        $LogPrint error $ScriptName ("Plugin '" . $ScriptVal->"name" . "' failed to run: " . $Err);
       }
     } else={
-      $LogPrint error $ScriptName ("Plugin '" . $PluginVal->"name" . "' failed syntax validation, skipping.");
+      $LogPrint error $ScriptName ("Plugin '" . $ScriptVal->"name" . "' failed syntax validation, skipping.");
     }
   }
 
   :foreach PluginName,Discard in=$CheckHealthPlugins do={
     ($CheckHealthPlugins->$PluginName) \
-        ("\$CheckHealthPlugins->\"" . $PluginName . "\"") $ScriptName;
+         ("\$CheckHealthPlugins->\"" . $PluginName . "\"");
   }
 
   :set CheckHealthPlugins;
diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 8b80dde..e28a019 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -28,7 +28,6 @@
   :global EscapeForRegEx;
   :global FetchUserAgentStr;
   :global LogPrint;
-  :global RebootForUpdate;
   :global ScriptFromTerminal;
   :global ScriptLock;
   :global SendNotification2;
@@ -63,14 +62,9 @@
   $WaitFullyConnected;
 
   :if ([ :len [ /system/scheduler/find where name="_RebootForUpdate" ] ] > 0) do={
-    :if ([ :typeof $RebootForUpdate ] = "nothing") do={
-      $LogPrint info $ScriptName ("Found a stale scheduler for reboot, removing.");
-      /system/scheduler/remove "_RebootForUpdate";
-    } else={
-      $LogPrint info $ScriptName ("A reboot for update is already scheduled.");
-      :set ExitOK true;
-      :error false;
-    }
+    $LogPrint info $ScriptName ("A reboot for update is already scheduled.");
+    :set ExitOK true;
+    :error false;
   }
 
   $LogPrint debug $ScriptName ("Checking for updates...");
diff --git a/doc/capsman-download-packages.md b/doc/capsman-download-packages.md
index 5722227..4daad49 100644
--- a/doc/capsman-download-packages.md
+++ b/doc/capsman-download-packages.md
@@ -4,7 +4,7 @@ Download packages for CAP upgrade from CAPsMAN
 [![GitHub stars](https://img.shields.io/github/stars/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=red)](https://github.com/eworm-de/routeros-scripts/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=green)](https://github.com/eworm-de/routeros-scripts/network)
 [![GitHub watchers](https://img.shields.io/github/watchers/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=blue)](https://github.com/eworm-de/routeros-scripts/watchers)
-[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.15-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
+[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.18-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
 [![Telegram group @routeros_scripts](https://img.shields.io/badge/Telegram-%40routeros__scripts-%2326A5E4?logo=telegram&style=flat)](https://t.me/routeros_scripts)
 [![donate with PayPal](https://img.shields.io/badge/Like_it%3F-Donate!-orange?logo=githubsponsors&logoColor=orange&style=flat)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)
 
diff --git a/doc/fw-addr-lists.md b/doc/fw-addr-lists.md
index 46b80c2..d09383b 100644
--- a/doc/fw-addr-lists.md
+++ b/doc/fw-addr-lists.md
@@ -32,10 +32,7 @@ certificate is checked.
 
 > ⚠️ **Warning**: The script does not limit the size of a list, but keep in
 > mind that huge lists can exhaust your device's resources (RAM and CPU),
-> and may take a long time to process.  
-> Even crashes for the complete scripting (and CLI) subsystem are possible.
-> This should be logged accordingly with warnings when global functions are
-> reloaded from scheduler.
+> and may take a long time to process.
 
 Requirements and installation
 -----------------------------
diff --git a/doc/packages-update.md b/doc/packages-update.md
index a0a1795..75225fe 100644
--- a/doc/packages-update.md
+++ b/doc/packages-update.md
@@ -46,8 +46,8 @@ Configuration
 
 The configuration goes to `global-config-overlay`, this is the only parameter:
 
-* `PackagesUpdateDeferReboot`: defer the reboot for night (between 3 AM and
-  5 AM), use a numerical value in days suffixed with a `d` to defer further
+* `PackagesUpdateDeferReboot`: defer the reboot for night (between 3 AM
+  and 5 AM)
 
 By modifying the scheduler's `start-time` you can force the reboot at
 different time.
diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 0c45f7e..efd37db 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -48,12 +48,6 @@
   }
   $WaitFullyConnected;
 
-  :if ([ :len [ /log/find where topics=({"script"; "warning"}) \
-      message=("\$LogPrintOnce: The message is already in log, scripting subsystem may have crashed before!") ] ] > 0) do={
-    $LogPrintOnce warning $ScriptName ("Scripting subsystem may have crashed, possibly caused by us. Delaying!");
-    :delay 5m;
-  }
-
   :local ListComment ("managed by " . $ScriptName);
 
   :foreach FwListName,FwList in=$FwAddrLists do={
diff --git a/global-functions.rsc b/global-functions.rsc
index 10d1b41..50426b6 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -133,11 +133,6 @@
     }
   }
 
-  :if ([ :len [ /certificate/find where common-name=$CommonName ] ] > 1) do={
-    $LogPrint info $0 ("There are " . $CertCount . " Certificates with CommonName '" . $CommonName . "'. Should be ok.");
-    :return true;
-  }
-
   :local CertVal [ /certificate/get [ find where common-name=$CommonName ] ];
   :while (($CertVal->"akid") != "" && ($CertVal->"akid") != ($CertVal->"skid")) do={
     :if ([ :len [ /certificate/find where skid=($CertVal->"akid") ] ] = 0) do={
@@ -564,12 +559,6 @@
 :set FileGet do={
   :local FileName [ :tostr $1 ];
 
-  :global WaitForFile;
-
-  :if ([ $WaitForFile $FileName 0s ] = false) do={
-    :return false;
-  }
-
   :local FileVal false;
   :do {
     :set FileVal [ /file/get $FileName ];
@@ -1613,9 +1602,7 @@
 
   :global LogPrintOnce;
 
-  :global SymbolsExtra;
-
-  :local Symbols ({
+  :local Symbols {
     "abacus"="\F0\9F\A7\AE";
     "alarm-clock"="\E2\8F\B0";
     "arrow-down"="\E2\AC\87";
@@ -1650,7 +1637,7 @@
     "star"="\E2\AD\90";
     "warning-sign"="\E2\9A\A0";
     "white-heavy-check-mark"="\E2\9C\85"
-  }, $SymbolsExtra);
+  }
 
   :if ([ :len ($Symbols->$Name) ] = 0) do={
     $LogPrintOnce warning $0 ("No symbol available for name '" . $Name . "'!");
@@ -1784,26 +1771,14 @@
   :global MAX;
 
   :set FileName [ $CleanFilePath $FileName ];
-  :local Delay ([ $MAX [ $EitherOr $WaitTime 2s ] 100ms ] / 9);
+  :local Delay ([ $MAX [ $EitherOr $WaitTime 2s ] 100ms ] / 10);
 
   :do {
-    :retry { 
-      :if ([ :len [ /file/find where name=$FileName ] ] = 0) do={
-        :error false;
-      }
-    } delay=$Delay max=10;
-  } on-error={
-    :return false;
-  }
-
-  :while ([ :len [ /file/find where name=$FileName ] ] > 0) do={
-    :do {
+    :retry {
       /file/get $FileName;
       :return true;
-    } on-error={ }
-    :delay $Delay;
-    :set Delay ($Delay * 3 / 2);
-  }
+    } delay=$Delay max=10;
+  } on-error={ }
 
   :return false;
 }
diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 9e2f9bc..4fa076a 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -119,13 +119,11 @@
 
     :local Data false;
     :onerror Err {
-      :retry {
-        :set Data ([ /tool/fetch check-certificate=yes-without-crl output=user \
-          http-header-field=({ "accept: application/dns-message" }) \
-          url=(($DohServer->"doh-url") . "?dns=" . [ :convert to=base64 ([ :rndstr length=2 ] . \
-          "\01\00" . "\00\01" . "\00\00" . "\00\00" . "\00\00" . "\09doh-check\05eworm\02de\00" . \
-          "\00\10" . "\00\01") ]) as-value ]->"data");
-      } delay=1s max=3;
+      :set Data ([ /tool/fetch check-certificate=yes-without-crl output=user \
+        http-header-field=({ "accept: application/dns-message" }) \
+        url=(($DohServer->"doh-url") . "?dns=" . [ :convert to=base64 ([ :rndstr length=2 ] . \
+        "\01\00" . "\00\01" . "\00\00" . "\00\00" . "\00\00" . "\09doh-check\05eworm\02de\00" . \
+        "\00\10" . "\00\01") ]) as-value ]->"data");
     } do={
       $LogPrint warning $ScriptName ("Request to DoH server " . ($DohServer->"doh-url") . \
           " failed: " . $Err);
diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index 1fcc203..00f03cd 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -62,14 +62,14 @@
 
     :local FwAddrList ($ScriptName . "-" . [ $GetRandom20CharAlNum ]);
     :if ([ :typeof [ :toip $Expected ] ] = "ip") do={
-      /ip/firewall/address-list/add address=$Name list=$FwAddrList dynamic=yes timeout=30s;
+      /ip/firewall/address-list/add address=$Name list=$FwAddrList dynamic=yes timeout=10s;
       :delay 20ms;
       :if ([ :len [ /ip/firewall/address-list/find where list=$FwAddrList address=$Expected ] ] > 0) do={
         :return true;
       }
     }
     :if ([ :typeof [ :toip6 $Expected ] ] = "ip6") do={
-      /ipv6/firewall/address-list/add address=$Name list=$FwAddrList dynamic=yes timeout=30s;
+      /ipv6/firewall/address-list/add address=$Name list=$FwAddrList dynamic=yes timeout=10s;
       :delay 20ms;
       :if ([ :len [ /ipv6/firewall/address-list/find where list=$FwAddrList address=$Expected ] ] > 0) do={
         :return true;
@@ -127,7 +127,7 @@
               $LogPrint [ $IfThenElse ($HostInfo->"no-resolve-fail" != true) warning debug ] \
                   $ScriptName ("Resolving name '" . $HostInfo->"resolve" . [ $IfThenElse \
                   ($HostInfo->"resolve" != $HostInfo->"name") ("' for " . $Type . " '" . \
-                  $HostInfo->"name") "" ] . "' failed third time: " . $Err);
+                  $HostInfo->"name") "" ] . "' failed: " . $Err);
             }
           }
         }
diff --git a/packages-update.rsc b/packages-update.rsc
index d3140f2..4fde131 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -31,25 +31,19 @@
   :local Schedule do={
     :local ScriptName [ :tostr $1 ];
 
-    :global PackagesUpdateDeferReboot;
-
     :global GetRandomNumber;
-    :global IfThenElse;
     :global LogPrint;
 
     :global RebootForUpdate do={
       /system/reboot;
     }
 
-    :local Interval [ $IfThenElse ([ :totime $PackagesUpdateDeferReboot ] >= 1d) \
-        $PackagesUpdateDeferReboot 1d ];
     :local StartTime [ :tostr [ :totime (10800 + [ $GetRandomNumber 7200 ]) ] ];
-    /system/scheduler/add name="_RebootForUpdate" start-time=$StartTime interval=$Interval \
+    /system/scheduler/add name="_RebootForUpdate" start-time=$StartTime interval=1d \
         on-event=("/system/scheduler/remove \"_RebootForUpdate\"; " . \
         ":global RebootForUpdate; \$RebootForUpdate;");
     $LogPrint info $ScriptName ("Scheduled reboot for update at " . $StartTime . \
-        " local time (" . [ /system/clock/get time-zone-name ] . ")" . \
-        [ $IfThenElse ($Interval > 1d) (" deferred by " . $Interval) ] . ".");
+        " local time (" . [ /system/clock/get time-zone-name ] . ").");
     :return true;
   }
 
@@ -159,7 +153,7 @@
       :error true;
     }
   } else={
-    :if ($PackagesUpdateDeferReboot = true || [ :totime $PackagesUpdateDeferReboot ] >= 1d) do={
+    :if ($PackagesUpdateDeferReboot = true) do={
       $Schedule $ScriptName;
       :set ExitOK true;
       :error true;