diff --git a/bash/decoders/dump978.sh b/bash/decoders/dump978.sh
index 78603ac..0e302b0 100755
--- a/bash/decoders/dump978.sh
+++ b/bash/decoders/dump978.sh
@@ -222,7 +222,7 @@ if [[ $(dpkg-query -W -f='${STATUS}' dump1090-mutability 2>/dev/null | grep -c "
     ChangeConfig "DEVICE" ${DUMP1090_DEVICE_ID} "/etc/default/dump1090-mutability"
     echo -e "\e[94m  Restarting dump1090-mutability...\e[97m"
     echo -e ""
-    sudo /etc/init.d/dump1090-mutability restart
+    sudo service dump1090-mutability force-reload
     echo -e ""
 
     # Get the latitude and longitude set in the dump1090-mutability configuration file to be used later.
diff --git a/bash/image.sh b/bash/image.sh
index d46c4a7..e2fc58a 100755
--- a/bash/image.sh
+++ b/bash/image.sh
@@ -117,7 +117,7 @@ if [[ $(dpkg-query -W -f='${STATUS}' dump1090-mutability 2>/dev/null | grep -c "
     # Reload dump1090-mutability to ensure all changes take effect.
     echo -e "\e[94m  Reloading dump1090-mutability...\e[97m"
     echo -e ""
-    sudo /etc/init.d/dump1090-mutability force-reload
+    sudo service dump1090-mutability force-reload
 fi
 
 # Download Heywhatsthat.com maximum range rings if the user wishes them to be displayed.
@@ -207,22 +207,6 @@ if [[ $(dpkg-query -W -f='${STATUS}' dump1090-fa 2>/dev/null | grep -c "ok insta
         fi
     fi
 
-    if [[ -n "${FLIGHTAWARE_LOGIN}" ]] && [[ -n "${FLIGHTAWARE_PASSWORD1}" ]] ; then
-        # Set the supplied user name and password in the configuration.
-        echo -e "\e[94m  Setting the flightaware-user setting using piaware-config...\e[97m"
-        echo -e ""
-        sudo piaware-config flightaware-user ${FLIGHTAWARE_LOGIN}
-        echo -e ""
-        echo -e "\e[94m  Setting the flightaware-password setting using piaware-config...\e[97m"
-        echo -e ""
-        sudo piaware-config flightaware-password ${FLIGHTAWARE_PASSWORD1}
-        echo -e ""
-        echo -e "\e[94m  Restarting PiAware to ensure changes take effect...\e[97m"
-        echo -e ""
-        sudo /etc/init.d/piaware restart
-        echo -e ""
-    fi
-
     # PiAware configuration is now complete.
     echo -e ""
     echo -e "\e[93m  ------------------------------------------------------------------------------"
diff --git a/bash/portal/graphs.sh b/bash/portal/graphs.sh
index ef112eb..66c4032 100755
--- a/bash/portal/graphs.sh
+++ b/bash/portal/graphs.sh
@@ -94,7 +94,7 @@ if [[ "${DUMP1090_INSTALLED}" = "true" ]] && [[ "${DUMP1090_FORK}" = "mutability
 
     echo -e "\e[94m  Reloading dump1090-mutability...\e[97m"
     echo ""
-    sudo /etc/init.d/dump1090-mutability force-reload 2>&1
+    sudo service dump1090-mutability force-reload 2>&1
     echo ""
 fi
 
@@ -350,7 +350,7 @@ echo -e ""
 
 echo -e "\e[94m  Reloading collectd so the new configuration is used...\e[97m"
 echo -e ""
-sudo /etc/init.d/collectd force-reload 2>&1
+sudo service collectd force-reload
 echo -e ""
 
 ## EDIT CRONTAB
diff --git a/bash/portal/install.sh b/bash/portal/install.sh
index e6107b4..2c7085d 100755
--- a/bash/portal/install.sh
+++ b/bash/portal/install.sh
@@ -284,7 +284,7 @@ fi
 # Reload Lighttpd after installing the prerequisite packages.
 echo -e "\e[94m  Reloading Lighttpd...\e[97m"
 echo -e ""
-sudo /etc/init.d/lighttpd force-reload
+sudo service lighttpd force-reload
 
 ## SETUP THE PORTAL WEBSITE
 
@@ -402,11 +402,11 @@ fi
 if pgrep "lighttpd" > /dev/null; then
     echo -e "\e[94m  Reloading Lighttpd...\e[97m"
     echo -e ""
-    sudo /etc/init.d/lighttpd force-reload
+    sudo service lighttpd force-reload
 else
     echo -e "\e[94m  Starting Lighttpd...\e[97m"
     echo -e ""
-    sudo /etc/init.d/lighttpd start
+    sudo service lighttpd start
 fi
 
 ## SETUP THE MYSQL DATABASE