diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt
index 8eefca520c..532dc55891 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.util.view.DeferredField
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.channels.ConflatedBroadcastChannel
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlin.coroutines.CoroutineContext
 
 class MigratingManga(
@@ -19,7 +19,7 @@ class MigratingManga(
     val searchResult = DeferredField<Long?>()
 
     // <MAX, PROGRESS>
-    val progress = ConflatedBroadcastChannel(1 to 0)
+    val progress = MutableStateFlow(1 to 0)
 
     val migrationJob = parentContext + SupervisorJob() + Dispatchers.Default
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
index e702eff541..e5a9d29472 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
@@ -37,6 +37,7 @@ import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import eu.kanade.tachiyomi.util.lang.toNormalized
 import eu.kanade.tachiyomi.util.system.executeOnIO
+import eu.kanade.tachiyomi.util.system.getParcelableCompat
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.system.launchUI
 import eu.kanade.tachiyomi.util.system.materialAlertDialog
@@ -77,7 +78,7 @@ class MigrationListController(bundle: Bundle? = null) :
 
     override val coroutineContext: CoroutineContext = Job() + Dispatchers.Default
 
-    val config: MigrationProcedureConfig? = args.getParcelable(CONFIG_EXTRA)
+    val config = args.getParcelableCompat(CONFIG_EXTRA, MigrationProcedureConfig::class.java)
 
     private val db: DatabaseHelper by injectLazy()
     private val preferences: PreferencesHelper by injectLazy()
@@ -196,7 +197,7 @@ class MigrationListController(bundle: Bundle? = null) :
                                                 } catch (e: Exception) {
                                                     return@source null
                                                 }
-                                                manga.progress.send(validSources.size to processedSources.incrementAndGet())
+                                                manga.progress.value = validSources.size to processedSources.incrementAndGet()
                                                 localManga to chapters.size
                                             } else {
                                                 null
@@ -243,7 +244,7 @@ class MigrationListController(bundle: Bundle? = null) :
                                     null
                                 }
 
-                                manga.progress.send(validSources.size to (index + 1))
+                                manga.progress.value = validSources.size to (index + 1)
 
                                 if (searchResult != null) return@async searchResult
                             }
@@ -266,7 +267,7 @@ class MigrationListController(bundle: Bundle? = null) :
                     } catch (e: CancellationException) {
                         // Ignore cancellations
                         throw e
-                    } catch (e: Exception) {
+                    } catch (_: Exception) {
                     }
                 }
 
@@ -383,7 +384,7 @@ class MigrationListController(bundle: Bundle? = null) :
                 } catch (e: CancellationException) {
                     // Ignore cancellations
                     throw e
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                 }
 
                 migratingManga.manga.migrationStatus = MigrationStatus.MANGA_FOUND
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt
index a170a17eda..c9a4ed003c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.ui.migration.manga.process
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MigrationProcedureConfig(