diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/framework/ViewModel.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/framework/ViewModel.kt
index 2e58f60a8..2de03edee 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/framework/ViewModel.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/framework/ViewModel.kt
@@ -12,7 +12,7 @@ import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import java.util.concurrent.atomic.AtomicLong
 
-abstract class ViewModel<T>(protected val runner: Runner? = null): Runner.TaskCallbacks {
+abstract class ViewModel<T: Any>(protected val runner: Runner? = null): Runner.TaskCallbacks {
     val id: Long = nextId.incrementAndGet()
     private val publisher by lazy { createSubject() }
 
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/injection/GlideModule.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/injection/GlideModule.kt
index f1b1fc6eb..eba4a1b6f 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/injection/GlideModule.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/injection/GlideModule.kt
@@ -12,6 +12,7 @@ import com.bumptech.glide.module.AppGlideModule
 import io.casey.musikcube.remote.ui.settings.constants.Prefs
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.ResponseBody.Companion.toResponseBody
 import java.io.InputStream
 import io.casey.musikcube.remote.ui.shared.util.AlbumArtLookup.canIntercept as canInterceptArtwork
 import io.casey.musikcube.remote.ui.shared.util.AlbumArtLookup.intercept as interceptArtwork
@@ -46,7 +47,7 @@ class GlideModule : AppGlideModule() {
             .request(chain.request())
             .code(404)
             .protocol(Protocol.HTTP_1_1)
-            .body(ResponseBody.create("application/json".toMediaTypeOrNull(), "{ }"))
+            .body("{ }".toResponseBody("application/json".toMediaTypeOrNull()))
             .message("not found")
             .build()
     }