diff --git a/app/build.gradle b/app/build.gradle
index 0db11560a..d9317c29b 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -149,7 +149,7 @@ dependencies {
     implementation 'com.github.pwittchen:reactivenetwork:0.7.0'
 
     // Network client
-    implementation "com.squareup.okhttp3:okhttp:3.13.1"
+    implementation "com.squareup.okhttp3:okhttp:3.12.2" // DO NOT UPGRADE TO 3.13.X+, it requires minSdk 21
     implementation 'com.squareup.okio:okio:1.17.2'
 
     // REST
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
index 10edb7a72..2fec11b4b 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
@@ -35,7 +35,7 @@ import uy.kohesive.injekt.injectLazy
 import java.net.URLEncoder
 import java.util.*
 import exh.metadata.metadata.base.RaisedTag
-import exh.eh.EHentaiUpdateWorker
+import exh.eh.EHentaiUpdateWorkerConstants
 import exh.eh.GalleryEntry
 import kotlinx.coroutines.runBlocking
 import org.jsoup.nodes.TextNode
@@ -404,7 +404,7 @@ class EHentai(override val id: Long,
 
                 lastUpdateCheck = System.currentTimeMillis()
                 if(datePosted != null
-                        && lastUpdateCheck - datePosted!! > EHentaiUpdateWorker.GALLERY_AGE_TIME) {
+                        && lastUpdateCheck - datePosted!! > EHentaiUpdateWorkerConstants.GALLERY_AGE_TIME) {
                     aged = true
                 }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
index 94383cb4d..e327e9183 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
@@ -21,6 +21,7 @@ import eu.kanade.tachiyomi.util.toast
 import exh.EH_SOURCE_ID
 import exh.EXH_SOURCE_ID
 import exh.eh.EHentaiUpdateWorker
+import exh.eh.EHentaiUpdateWorkerConstants
 import exh.eh.EHentaiUpdaterStats
 import exh.favorites.FavoritesIntroDialog
 import exh.favorites.LocalFavoritesStorage
@@ -234,8 +235,8 @@ class SettingsEhController : SettingsController() {
                             "${context.getString(R.string.app_name)} will currently never check galleries in your library for updates."
                         } else {
                             "${context.getString(R.string.app_name)} checks/updates galleries in batches. " +
-                                    "This means it will wait $newVal hour(s), check ${EHentaiUpdateWorker.UPDATES_PER_ITERATION} galleries," +
-                                    " wait $newVal hour(s), check ${EHentaiUpdateWorker.UPDATES_PER_ITERATION} and so on..."
+                                    "This means it will wait $newVal hour(s), check ${EHentaiUpdateWorkerConstants.UPDATES_PER_ITERATION} galleries," +
+                                    " wait $newVal hour(s), check ${EHentaiUpdateWorkerConstants.UPDATES_PER_ITERATION} and so on..."
                         }
                     }
 
diff --git a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
index b785b4e93..e611ef8fb 100644
--- a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
+++ b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
@@ -23,6 +23,7 @@ import eu.kanade.tachiyomi.util.jobScheduler
 import eu.kanade.tachiyomi.util.syncChaptersWithSource
 import exh.EH_SOURCE_ID
 import exh.EXH_SOURCE_ID
+import exh.eh.EHentaiUpdateWorkerConstants.UPDATES_PER_ITERATION
 import exh.metadata.metadata.EHentaiSearchMetadata
 import exh.metadata.metadata.base.*
 import exh.util.await
@@ -249,13 +250,10 @@ class EHentaiUpdateWorker: JobService(), CoroutineScope {
     }
 
     companion object {
-        const val UPDATES_PER_ITERATION = 50
         private const val MAX_UPDATE_FAILURES = 5
 
         private val MIN_BACKGROUND_UPDATE_FREQ = 1.days.inMilliseconds.longValue
 
-        val GALLERY_AGE_TIME = 365.days.inMilliseconds.longValue
-
         private const val JOB_ID_UPDATE_BACKGROUND = 0
         private const val JOB_ID_UPDATE_BACKGROUND_TEST = 1
 
@@ -342,3 +340,8 @@ class EHentaiUpdateWorker: JobService(), CoroutineScope {
 }
 
 data class UpdateEntry(val manga: Manga, val meta: EHentaiSearchMetadata, val rootChapter: Chapter?)
+
+object EHentaiUpdateWorkerConstants {
+    const val UPDATES_PER_ITERATION = 50
+    val GALLERY_AGE_TIME = 365.days.inMilliseconds.longValue
+}
diff --git a/build.gradle b/build.gradle
index d81bfea85..18c4f3411 100755
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,12 @@ buildscript {
         google()
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
+        maven { url 'http://storage.googleapis.com/r8-releases/raw' }
     }
     dependencies {
+        // Temp workaround for: https://issuetracker.google.com/issues/129730297
+        classpath 'com.android.tools:r8:1.4.88' // Must be before the Gradle Plugin for Android.
+
         classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
         classpath 'com.github.zellius:android-shortcut-gradle-plugin:0.1.2'