diff --git a/board/bananapi/uInitrd b/board/bananapi/uInitrd
index 183a1cbdd1..6dfda81ef8 100644
Binary files a/board/bananapi/uInitrd and b/board/bananapi/uInitrd differ
diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart
index adc39808c1..d8da86778b 100755
--- a/board/common/overlay/etc/init.d/S00datapart
+++ b/board/common/overlay/etc/init.d/S00datapart
@@ -45,7 +45,6 @@ case "$1" in
         msg_begin "Creating required data files"
         mkdir /data/etc
         mkdir /data/log
-        mkdir -m 775 /data/output
         mkdir -m 775 /data/media
         cp /etc/version /data/etc/version
         ln -s /usr/share/zoneinfo/UTC /data/etc/localtime
diff --git a/board/common/overlay/etc/init.d/S10watchdog b/board/common/overlay/etc/init.d/S13watchdog
similarity index 100%
rename from board/common/overlay/etc/init.d/S10watchdog
rename to board/common/overlay/etc/init.d/S13watchdog
diff --git a/board/common/overlay/etc/init.d/S41netwatch b/board/common/overlay/etc/init.d/S41netwatch
index 940d515083..c7421d72f8 100755
--- a/board/common/overlay/etc/init.d/S41netwatch
+++ b/board/common/overlay/etc/init.d/S41netwatch
@@ -7,7 +7,9 @@ netwatch_interval=20
 
 test -f $watch_conf && source $watch_conf || exit 0
 
-test -z "$netwatch_host" || -z "$netwatch_port" && exit 0
+if [ -z "$netwatch_host" ] || [ -z "$netwatch_port" ]; then
+    exit 0
+fi
 
 test -n "$os_version" || source /etc/init.d/base
 test -n "$os_debug" || source /etc/init.d/conf
@@ -18,10 +20,12 @@ watch() {
     count=0
     netwatch_retries=$(($netwatch_retries - 1))
     while true; do
+        sleep $netwatch_interval
         if nc -z -w $netwatch_timeout $netwatch_host $netwatch_port </dev/null >/dev/null 2>&1; then
             count=0
         else
             if [ $count -lt $netwatch_retries ]; then
+                logger -t netwatch -s "cannot connect to $netwatch_host:$netwatch_port"
                 count=$(($count + 1))
                 continue
             else
@@ -29,7 +33,6 @@ watch() {
                 reboot
             fi
         fi
-        sleep $netwatch_interval
     done
 }
 
diff --git a/board/common/overlay/sbin/fwupdate b/board/common/overlay/sbin/fwupdate
index a7795d361f..7cec9b4617 100755
--- a/board/common/overlay/sbin/fwupdate
+++ b/board/common/overlay/sbin/fwupdate
@@ -330,7 +330,7 @@ function do_upgrade() {
     
     set -e
 
-    do_download "$2"
+    do_download "$1"
     show_status
 
     do_extract
diff --git a/board/common/overlay/usr/share/post-upgrade/20160828.sh b/board/common/overlay/usr/share/post-upgrade/20160828.sh
deleted file mode 100755
index 8a66549a9a..0000000000
--- a/board/common/overlay/usr/share/post-upgrade/20160828.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# more settings have been added to [/data]/etc/os.conf
-
-echo 'os_networkless="false"' >> /data/etc/os.conf
-echo 'os_eth="eth0"' >> /data/etc/os.conf
-echo 'os_wlan="wlan0"' >> /data/etc/os.conf
-echo 'os_ppp="ppp0"' >> /data/etc/os.conf
-
-# boolean values in watch.conf have been normalized to "true" and "false"
-sed -i 's/=no/="false"/' /data/etc/watch.conf
-sed -i 's/=yes/="true"/' /data/etc/watch.conf
-
diff --git a/board/odroidc1/uInitrd b/board/odroidc1/uInitrd
index ab987fa42b..8f4ba6ed88 100644
Binary files a/board/odroidc1/uInitrd and b/board/odroidc1/uInitrd differ
diff --git a/board/odroidc2/uInitrd b/board/odroidc2/uInitrd
index f455ce372f..e14178f604 100644
Binary files a/board/odroidc2/uInitrd and b/board/odroidc2/uInitrd differ
diff --git a/board/odroidxu4/uInitrd b/board/odroidxu4/uInitrd
index 5ed854ada3..484ea295e8 100644
Binary files a/board/odroidxu4/uInitrd and b/board/odroidxu4/uInitrd differ
diff --git a/board/pine64/fwupdater.img b/board/pine64/fwupdater.img
index 573fe5bdfe..eedcd9fdf5 100644
Binary files a/board/pine64/fwupdater.img and b/board/pine64/fwupdater.img differ
diff --git a/board/pine64/overlay/usr/libexec/fw-prepare-boot b/board/pine64/overlay/usr/libexec/fw-prepare-boot
index 67ec46b152..aa419ef61c 100755
--- a/board/pine64/overlay/usr/libexec/fw-prepare-boot
+++ b/board/pine64/overlay/usr/libexec/fw-prepare-boot
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-sed 's/#initrd_filename=.*/initrd_filename=fwupdater.img/' uEnv.txt
+sed -r -i 's/#initrd_filename=.*/initrd_filename=fwupdater.img/' /boot/uEnv.txt
 
diff --git a/board/pine64/postscript.sh b/board/pine64/postscript.sh
index 3b6e69ee97..284948746c 100755
--- a/board/pine64/postscript.sh
+++ b/board/pine64/postscript.sh
@@ -6,5 +6,5 @@ mkdir -p $BOOT_DIR/pine64
 cp $IMG_DIR/Image $BOOT_DIR/kernel.img
 cp $BOARD_DIR/uEnv.txt $BOOT_DIR
 cp $BOARD_DIR/dtb/* $BOOT_DIR/pine64
-cp $BOARD_DIR/initrd.img $BOOT_DIR
+cp $BOARD_DIR/fwupdater.img $BOOT_DIR
 
diff --git a/board/raspberrypi/fwupdater.gz b/board/raspberrypi/fwupdater.gz
index 6bc64ad573..381d9314bd 100644
Binary files a/board/raspberrypi/fwupdater.gz and b/board/raspberrypi/fwupdater.gz differ
diff --git a/board/raspberrypi2/fwupdater.gz b/board/raspberrypi2/fwupdater.gz
index 6bc64ad573..381d9314bd 100644
Binary files a/board/raspberrypi2/fwupdater.gz and b/board/raspberrypi2/fwupdater.gz differ
diff --git a/board/raspberrypi3/fwupdater.gz b/board/raspberrypi3/fwupdater.gz
index 6bc64ad573..381d9314bd 100644
Binary files a/board/raspberrypi3/fwupdater.gz and b/board/raspberrypi3/fwupdater.gz differ