diff --git a/Diagnostics/Overlay/AndroidManifest.xml b/Diagnostics/Overlay/AndroidManifest.xml
index 6ae62d752..2240fb3bb 100644
--- a/Diagnostics/Overlay/AndroidManifest.xml
+++ b/Diagnostics/Overlay/AndroidManifest.xml
@@ -18,6 +18,7 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
   <application
+    android:label="@string/app_name"
     android:icon="@drawable/ic_launcher"
     android:theme="@style/Theme.Apptheme">
     <activity
diff --git a/Diagnostics/Overlay/build.gradle b/Diagnostics/Overlay/build.gradle
index edbe5ada1..8ac7374a6 100644
--- a/Diagnostics/Overlay/build.gradle
+++ b/Diagnostics/Overlay/build.gradle
@@ -1,15 +1,16 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
+
 apply plugin: 'com.android.application'
 
 repositories {
-    mavenCentral()
+    jcenter()
 }
 
 dependencies {
@@ -18,8 +19,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.0"
 
     buildTypes {
         debug {
diff --git a/Diagnostics/Overlay/src/com/commonsware/android/debug/videolist/RecyclerViewActivity.java b/Diagnostics/Overlay/src/com/commonsware/android/debug/videolist/RecyclerViewActivity.java
index 3c812ee43..5bac99c47 100644
--- a/Diagnostics/Overlay/src/com/commonsware/android/debug/videolist/RecyclerViewActivity.java
+++ b/Diagnostics/Overlay/src/com/commonsware/android/debug/videolist/RecyclerViewActivity.java
@@ -15,13 +15,22 @@
 package com.commonsware.android.debug.videolist;
 
 import android.app.Activity;
+import android.os.Build;
+import android.provider.Settings;
 import android.support.v7.widget.RecyclerView;
 
 public class RecyclerViewActivity extends Activity {
   private RecyclerView rv=null;
 
   public void setAdapter(RecyclerView.Adapter adapter) {
-    if (BuildConfig.DEBUG) {
+    boolean canDrawOverlays=
+        (Build.VERSION.SDK_INT<=Build.VERSION_CODES.LOLLIPOP_MR1);
+
+    if (!canDrawOverlays) {
+      canDrawOverlays=Settings.canDrawOverlays(this);
+    }
+
+    if (BuildConfig.DEBUG && canDrawOverlays) {
       adapter=new TimingWrapper(adapter, this);
     }