diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index 4bfabbdfed..7261fac6b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -127,7 +127,6 @@ open class AppModule {
     interface AppBindings {
 
         @Binds fun bindContext(mainApp: MainApp): Context
-        @Binds fun bindApplication(mainApp: MainApp): Application
         @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
 
         @Binds
diff --git a/core/build.gradle b/core/build.gradle
index 2c3a561ac7..58ed7cbfb3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -16,13 +16,26 @@ android {
         consumerProguardFiles 'consumer-rules.pro'
     }
 
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled(project.hasProperty('coverage'))
+        }
+        firebaseDisable {
+            System.setProperty("disableFirebase", "true")
         }
     }
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {