diff --git a/.travis.yml b/.travis.yml
index b404e262..a9b2a27c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ addons:
     - expect
     - upx
 go: 1.15.x
+os: linux
 dist: bionic
 services: docker
 install:
@@ -63,6 +64,7 @@ deploy:
       secure: GsvW0m+EnRELQMk8DjH63VXinqbwse4FJ4vNUslOE6CZ8PBXPrH0ZgaI7ic/uxRtm7CYj0sir4CZq62W5l6uhoXCCQfjOnmJspqnQcrFZ1xRdWktsNXaRwM6hlzaUThsJ/1PD9Psc66uKXBYTg0IlUz0yjZAZk7tCUE4libuj41z40ZKxUcbfcNvH4Njc9IpNB4QSA3ss+a9/6ZwBz4tHVamsGIrzaE0Zf99ItNBYvaOwhM2rC/NWIsFmwt8w4rIA2NIrkZgMDV+Z2Niqh4JRLAWCQNx/RjC5U52lG2yhqivUC3TromZ+q4O4alUltsyIzF2nVanLWgJmbeFo8uXT5A+gd3ovSkFLU9medXd9i4kap7kN/o5m9p5QZvrdEYHEmIU4ml5rjT2EQQVy5CtSmpiRAbhpEJIvA1wDtRq8rdz8IVfJXkHNjg2XdouNmMMWqa3OkEPw21+uxsqv4LscW/6ZjsavzL5SSdnBRU9n79EfGJE/tJLKiNumah/vLuJ5buNhgqmCdtX/Tg+DhQS1BOyYg4l4L8s9IIKZgFRwrOPsZnA/KsrWg4ZsjJ87cqKCaT/qs2EJx5odZcZWJYLBngeO8Tc6cQtLgJdieY2oEKo51Agq4rgikZDt21m6TY9/R5lPN0piwdpy3ZGKfv1ijXx74raMT03qskputzMCvc=
     overwrite: true
     skip_cleanup: true
+    cleanup: false
     file_glob: true
     file: release/*
     on:
@@ -74,6 +76,7 @@ deploy:
   - provider: script
     script: scripts/package-deploy.sh
     skip_cleanup: true
+    cleanup: false
     on:
       all_branches: true
       condition: $TRAVIS_BRANCH =~ ^(master|v[0-9.]+)$
diff --git a/scripts/after-install.sh b/scripts/after-install.sh
old mode 100644
new mode 100755
diff --git a/scripts/before-remove.sh b/scripts/before-remove.sh
old mode 100644
new mode 100755
index 589bf0bb..209f70c7
--- a/scripts/before-remove.sh
+++ b/scripts/before-remove.sh
@@ -11,4 +11,7 @@ fi
 if [ -x "/bin/systemctl" ]; then
   /bin/systemctl stop {{BINARY}}
   /bin/systemctl disable {{BINARY}}
+elif [ -x /usr/sbin/service ]; then
+  /usr/sbin/service {{BINARY}} stop
+  /usr/sbin/service {{BINARY}} disable
 fi
diff --git a/scripts/formula-deploy.sh b/scripts/formula-deploy.sh
old mode 100644
new mode 100755
diff --git a/scripts/install.sh b/scripts/install.sh
old mode 100644
new mode 100755
index 9337b922..e0cf0851
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -4,8 +4,8 @@
 #
 # Use it like this, pick curl or wget:  (sudo is optional)
 # ----
-#   curl -sL https://raw.githubusercontent.com/unifi-poller/unifi-poller/main/scripts/install.sh | sudo bash
-#   wget -qO- https://raw.githubusercontent.com/unifi-poller/unifi-poller/main/scripts/install.sh | sudo bash
+#   curl -sL https://raw.githubusercontent.com/unifi-poller/unifi-poller/master/scripts/install.sh | sudo bash
+#   wget -qO- https://raw.githubusercontent.com/unifi-poller/unifi-poller/master/scripts/install.sh | sudo bash
 # ----
 #
 # - If you're on RedHat/CentOS/Fedora, installs the latest rpm package.