diff --git a/.travis.yml b/.travis.yml
index 8f34e4b8..53a77630 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,14 @@ before_script:
   - echo sdk.dir $ANDROID_HOME > local.properties
 script:
   - export TERM=dumb
-  - export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
+  - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
   - ./gradlew build
 android:
   components:
   - platform-tools
   - tools
-  - build-tools-23.0.3
-  - android-23
+  - build-tools-24.0.2
+  - android-24
   - extra-android-m2repository
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
index 03302c7f..59efa4b2 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
@@ -338,6 +338,7 @@ public class LoginActivity extends AssistantActivity {
     }
 
     private class JsBridge {
+        @SuppressWarnings("MissingPermission")
         @JavascriptInterface
         public final String getAccounts() {
             Account[] accountsByType = accountManager.getAccountsByType(accountType);
diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java
index 1076d211..c7517e6d 100644
--- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java
@@ -36,6 +36,7 @@ import java.util.List;
 public class CheckinManager {
     private static final long MIN_CHECKIN_INTERVAL = 3 * 60 * 60 * 1000; // 3 hours
 
+    @SuppressWarnings("MissingPermission")
     public static synchronized LastCheckinInfo checkin(Context context, boolean force) throws IOException {
         LastCheckinInfo info = LastCheckinInfo.read(context);
         if (!force && info.lastCheckin > System.currentTimeMillis() - MIN_CHECKIN_INTERVAL)
diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
index 4eb1c48e..046221bc 100644
--- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
@@ -48,6 +48,7 @@ public class CheckinService extends IntentService {
         super(TAG);
     }
 
+    @SuppressWarnings("MissingPermission")
     @Override
     protected void onHandleIntent(Intent intent) {
         try {
diff --git a/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
index a7905b3a..d602a6ec 100644
--- a/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
@@ -46,6 +46,7 @@ public class PeopleServiceImpl extends IPeopleService.Stub {
         this.context = context;
     }
 
+    @SuppressWarnings("MissingPermission")
     @Override
     public void loadOwners(final IPeopleCallbacks callbacks, boolean var2, boolean var3, final String accountName, String var5, int sortOrder) {
         Log.d(TAG, "loadOwners: " + var2 + ", " + var3 + ", " + accountName + ", " + var5 + ", " + sortOrder);
diff --git a/play-services-core/src/main/res/menu/pick_place.xml b/play-services-core/src/main/res/menu/pick_place.xml
index f05d6d91..5bdd8f45 100644
--- a/play-services-core/src/main/res/menu/pick_place.xml
+++ b/play-services-core/src/main/res/menu/pick_place.xml
@@ -15,12 +15,14 @@
   ~ limitations under the License.
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:tools="http://schemas.android.com/tools"
+      xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_action_search"
         android:icon="@drawable/ic_magnify"
         android:title="@android:string/search_go"
         app:actionViewClass="android.support.v7.widget.SearchView"
-        app:showAsAction="ifRoom|collapseActionView"/>
+        app:showAsAction="ifRoom|collapseActionView"
+        tools:ignore="AppCompatResource"/>
 </menu>
\ No newline at end of file