diff --git a/.travis.yml b/.travis.yml
index 41f783670e3c83cd8c971d5dbf78aaff0939d5bc..3e122eddb20fea574e870b5bf0bd2fd22e270b99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@ matrix:
           env: SPEC=linux-g++-64 CONFIG=installer
           sudo: true
         - os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: SPEC=macx-clang CONFIG=debug
         - os: osx
-          osx_image: beta-xcode6.3
+          osx_image: xcode7
           env: SPEC=macx-clang CONFIG=installer
         - os: android
           language: android
diff --git a/QGCCommon.pri b/QGCCommon.pri
index 37309504f4cb1249919a183658a0e27593ea3543..6a76a5647ca566da33011bd1dd9d1325b5881a78 100644
--- a/QGCCommon.pri
+++ b/QGCCommon.pri
@@ -157,7 +157,7 @@ MacBuild {
     CONFIG += x86_64
     CONFIG -= x86
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
-    QMAKE_MAC_SDK = macosx10.9
+    QMAKE_MAC_SDK = macosx10.11
 }
 
 LinuxBuild {
diff --git a/src/VehicleSetup/JoystickConfigController.cc b/src/VehicleSetup/JoystickConfigController.cc
index cec3c9b8373b0f185f793361ae615da17c9598be..7452e15d0aec4c374c37ec9640f35e6db7ad81c2 100644
--- a/src/VehicleSetup/JoystickConfigController.cc
+++ b/src/VehicleSetup/JoystickConfigController.cc
@@ -150,7 +150,7 @@ void JoystickConfigController::_setupCurrentState(void)
 
 void JoystickConfigController::_axisValueChanged(int axis, int value)
 {
-    if (axis >= 0 && axis <= _axisMax) {
+    if (axis >= 0 && axis < _axisMax) {
         // We always update raw values
         _axisRawValue[axis] = value;
         emit axisValueChanged(axis, _axisRawValue[axis]);