diff --git a/.travis.yml b/.travis.yml
index b27ce26..e61b8ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,11 @@ language: cpp
 
 os: linux
 
-dist: bionic
+dist: trusty
+
+cache:
+  directories:
+  - ${HOME}/PawPawBuilds/downloads
 
 jobs:
   include:
@@ -44,6 +48,6 @@ script:
   - bash ${TRAVIS_BUILD_DIR}/bootstrap.sh ${TARGET}
   - bash ${TRAVIS_BUILD_DIR}/build-plugin.sh ${TARGET} ${PLUGINS}
 
-notifications:
-  email: true
-  irc: "ircs://chat.freenode.net:7070/#kxstudio"
+#notifications:
+  #email: true
+  #irc: "ircs://chat.freenode.net:7070/#kxstudio"
diff --git a/.travis/install.sh b/.travis/install.sh
index 3bb158f..39cfc3d 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -10,9 +10,9 @@ if [ "${TARGET}" = "macos-old" ]; then
     sudo apt-get install -y apple-x86-gcc apple-uni-sdk-10.5
 
 elif [ "${TARGET}" = "win32" ]; then
-    sudo apt-get install -y mingw-w64 binutils-mingw-w64-i686 g++-mingw-w64-i686
+    sudo apt-get install -y mingw32-x-gcc
 
 elif [ "${TARGET}" = "win64" ]; then
-    sudo apt-get install -y mingw-w64 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
+    sudo apt-get install -y mingw64-x-gcc
 
 fi
diff --git a/setup/check_target.sh b/setup/check_target.sh
index 0eece72..5e1e849 100644
--- a/setup/check_target.sh
+++ b/setup/check_target.sh
@@ -9,7 +9,7 @@ WIN64=0
 
 function check_target() {
     case "${target}" in
-        "macos")
+        "macos"|"Darwin")
             MACOS=1
             ;;
         "macos-old")
@@ -26,7 +26,7 @@ function check_target() {
             WIN64=1
             CROSS_COMPILING=1
             ;;
-        "Linux")
+        "linux"|"Linux")
             LINUX=1
             ;;
         "native")