diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
index dcae87dbcf..f48853f304 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
@@ -96,7 +96,7 @@ class BackupRestoreService : Service() {
 
     private fun destroyJob() {
         backupRestore?.job?.cancel()
-        ioScope?.cancel()
+        ioScope.cancel()
         if (wakeLock.isHeld) {
             wakeLock.release()
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
index 7ff44191ce..7a1231338d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
@@ -68,7 +68,7 @@ class CategoryGetResolver : DefaultGetResolver<Category>() {
                 mangaSort = orderString.first()
                 mangaOrder = emptyList()
             }
-            else -> mangaOrder = orderString.split("/")?.mapNotNull { it.toLongOrNull() }
+            else -> mangaOrder = orderString.split("/").mapNotNull { it.toLongOrNull() }
         }
     }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
index 39f9287830..577e428237 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
@@ -94,7 +94,7 @@ interface Manga : SManga {
                 TYPE_COMIC -> R.string.comic
                 else -> R.string.manga
             }
-        ).toLowerCase(Locale.getDefault())
+        ).lowercase(Locale.getDefault())
     }
 
     fun getGenres(): List<String>? {
@@ -113,7 +113,7 @@ interface Manga : SManga {
     fun seriesType(useOriginalTags: Boolean = false, customTags: String? = null, sourceManager: SourceManager? = null): Int {
         val sourceName by lazy { (sourceManager ?: Injekt.get()).getOrStub(source).name }
         val tags = customTags ?: if (useOriginalTags) originalGenre else genre
-        val currentTags = tags?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList()
+        val currentTags = tags?.split(",")?.map { it.trim().lowercase(Locale.US) } ?: emptyList()
         return if (currentTags.any { tag -> isMangaTag(tag) }) {
             TYPE_MANGA
         } else if (currentTags.any { tag -> isComicTag(tag) } ||
@@ -173,7 +173,7 @@ interface Manga : SManga {
     }
 
     fun isSeriesTag(tag: String): Boolean {
-        val tagLower = tag.toLowerCase(Locale.ROOT)
+        val tagLower = tag.lowercase(Locale.ROOT)
         return isMangaTag(tagLower) || isManhuaTag(tagLower) ||
             isManhwaTag(tagLower) || isComicTag(tagLower) || isWebtoonTag(tagLower)
     }
@@ -188,7 +188,7 @@ interface Manga : SManga {
 
     fun isLongStrip(): Boolean {
         val currentTags =
-            genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList()
+            genre?.split(",")?.map { it.trim().lowercase(Locale.US) } ?: emptyList()
         val sourceName by lazy { Injekt.get<SourceManager>().getOrStub(source).name }
         return currentTags.any { it == "long strip" } || sourceName.contains("webtoon", true)
     }