diff --git a/.travis.yml b/.travis.yml
index ba4155a..0aa23c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@
 language: android
 android:
   components:
+    - tools
+    - platform-tools
     - build-tools-21.1.1
     - android-21
     - extra-android-support
diff --git a/app/build.gradle b/app/build.gradle
index 11c4933..ce17358 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,7 +46,8 @@ dependencies {
     compile 'com.jakewharton:butterknife:+'
     compile 'com.readystatesoftware.systembartint:systembartint:+'
     compile 'com.netflix.rxjava:rxjava-android:+'
-    compile 'com.android.support:appcompat-v7:21.+'
+    // Version lock needed b SO question 26488015
+    compile 'com.android.support:appcompat-v7:21.0.2'
     compile 'org.apache.commons:commons-lang3:+'
     compile 'com.google.code.gson:gson:+'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"