diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt
index fbf3b0ea6..256daebba 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt
@@ -282,6 +282,7 @@ class PreMigrationController(bundle: Bundle? = null) :
         val disabledSources = sourcePreferences.disabledSources().get()
             .mapNotNull { it.toLongOrNull() }
         val sources = sourceManager.getVisibleCatalogueSources()
+            .asSequence()
             .filterIsInstance<HttpSource>()
             .filter { it.lang in languages }
             .sortedBy { "(${it.lang}) ${it.name}" }
@@ -295,11 +296,14 @@ class PreMigrationController(bundle: Bundle? = null) :
                     ),
                 )
             }
+            .toList()
 
         return sources
             .filter { it.sourceEnabled }
-            .sortedBy { sourcesSaved.indexOf(it.source.id) } +
-            sources.filterNot { it.sourceEnabled }
+            .sortedBy { sourcesSaved.indexOf(it.source.id) }
+            .plus(
+                sources.filterNot { it.sourceEnabled },
+            )
     }
 
     fun isEnabled(
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt
index 2d937148e..bb47ac799 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt
@@ -14,7 +14,7 @@ class MigratingManga(
     parentContext: CoroutineContext,
     val getManga: suspend (SearchResult.Result) -> Manga?,
     val getChapterInfo: suspend (SearchResult.Result) -> ChapterInfo,
-    val getSourceName: (Manga) -> String?,
+    val getSourceName: (Manga) -> String,
 ) {
     val migrationScope = CoroutineScope(parentContext + SupervisorJob() + Dispatchers.Default)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt
index fd7ada2a3..482c7a03b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt
@@ -101,7 +101,7 @@ class MigrationProcessHolder(
                     }
                     if (resultManga != null) {
                         val (sourceName, latestChapter) = withIOContext {
-                            val sourceNameAsync = async { migrateManga.getSourceName(resultManga).orEmpty() }
+                            val sourceNameAsync = async { migrateManga.getSourceName(resultManga) }
                             val latestChapterAsync = async { migrateManga.getChapterInfo(searchResult as SearchResult.Result) }
                             sourceNameAsync.await() to latestChapterAsync.await()
                         }
diff --git a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt
index b9c11416d..a588cae93 100644
--- a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt
+++ b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt
@@ -166,7 +166,7 @@ class BrowserActionActivity : AppCompatActivity() {
                                 // Rob demo credentials
                                 .url("https://speech-to-text-demo.ng.bluemix.net/api/v1/credentials")
                                 .build(),
-                        ).await().parseAs<JsonObject>()["token"]!!.jsonPrimitive.content
+                        ).await().parseAs<JsonObject>()["token"]!!.jsonPrimitive.content,
                     )
                 } catch (e: Exception) {
                     xLogE("Failed to get credentials", e)
@@ -269,7 +269,6 @@ class BrowserActionActivity : AppCompatActivity() {
                         } catch (e: Exception) {
                             captchaSolveFail()
                         }
-
                     }
                 } else {
                     binding.webview.postDelayed(