diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
index 19603d99e6..c057b9244b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
@@ -242,6 +242,7 @@ public class RuffyScripter implements RuffyCommands {
             Thread cmdThread = null;
             try {
                 activeCmd = cmd;
+                unparsableMenuEncountered = false;
                 long connectStart = System.currentTimeMillis();
                 ensureConnected();
                 log.debug("Connection ready to execute cmd " + cmd);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
index 2131d5e321..6119c07c37 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.source
 
-import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
@@ -33,9 +32,9 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
     private val log = LoggerFactory.getLogger(L.BGSOURCE)
 
     private val PACKAGE_NAMES = arrayOf("com.dexcom.cgm.region1.mgdl", "com.dexcom.cgm.region1.mmol",
-                                        "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol",
-                                        "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl",
-                                        "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol")
+            "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol",
+            "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl",
+            "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol")
 
     const val PERMISSION = "com.dexcom.cgm.EXTERNAL_PERMISSION"
 
@@ -83,7 +82,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
             val meters = intent.getBundleExtra("meters")
             for (i in 0 until meters.size()) {
                 val meter = meters.getBundle(i.toString())
-                val timestamp = meter.getLong("timestamp") * 1000
+                val timestamp = meter!!.getLong("timestamp") * 1000
                 if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) != null) continue
                 val jsonObject = JSONObject()
                 jsonObject.put("enteredBy", "AndroidAPS-Dexcom")
@@ -95,7 +94,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
                 NSUpload.uploadCareportalEntryToNS(jsonObject)
             }
             if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false) && intent.hasExtra("sensorInsertionTime")) {
-                val sensorInsertionTime = intent.extras.getLong("sensorInsertionTime") * 1000
+                val sensorInsertionTime = intent.extras!!.getLong("sensorInsertionTime") * 1000
                 if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) {
                     val jsonObject = JSONObject()
                     jsonObject.put("enteredBy", "AndroidAPS-Dexcom")
@@ -104,7 +103,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
                     NSUpload.uploadCareportalEntryToNS(jsonObject)
                 }
             }
-        } catch (e : Exception) {
+        } catch (e: Exception) {
             log.error("Error while processing intent from Dexcom App", e)
         }
     }
diff --git a/build.gradle b/build.gradle
index 398f280881..5d8db15fe6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath 'io.fabric.tools:gradle:1.29.0'