diff --git a/app/src/main/java/to/bitkit/async/ServiceQueue.kt b/app/src/main/java/to/bitkit/async/ServiceQueue.kt
index d5714cf90..a2499619e 100644
--- a/app/src/main/java/to/bitkit/async/ServiceQueue.kt
+++ b/app/src/main/java/to/bitkit/async/ServiceQueue.kt
@@ -17,7 +17,7 @@ import kotlin.coroutines.CoroutineContext
 enum class ServiceQueue {
     LDK, CORE, FOREX, MIGRATION;
 
-    private val scope by lazy { CoroutineScope(dispatcher("$name-queue".lowercase()) + SupervisorJob()) }
+    private val scope by lazy { CoroutineScope(newSingleThreadDispatcher(name) + SupervisorJob()) }
 
     fun <T> blocking(
         coroutineContext: CoroutineContext = scope.coroutineContext,
@@ -52,11 +52,10 @@ enum class ServiceQueue {
             }
         }
     }
+}
 
-    companion object {
-        fun dispatcher(name: String): ExecutorCoroutineDispatcher {
-            val threadFactory = ThreadFactory { Thread(it, name).apply { priority = Thread.NORM_PRIORITY - 1 } }
-            return Executors.newSingleThreadExecutor(threadFactory).asCoroutineDispatcher()
-        }
-    }
+fun newSingleThreadDispatcher(id: String): ExecutorCoroutineDispatcher {
+    val name = "$id-queue".lowercase()
+    val threadFactory = ThreadFactory { Thread(it, name).apply { priority = Thread.NORM_PRIORITY - 1 } }
+    return Executors.newSingleThreadExecutor(threadFactory).asCoroutineDispatcher()
 }
diff --git a/app/src/main/java/to/bitkit/env/Env.kt b/app/src/main/java/to/bitkit/env/Env.kt
index b9ed0ac97..840403ff3 100644
--- a/app/src/main/java/to/bitkit/env/Env.kt
+++ b/app/src/main/java/to/bitkit/env/Env.kt
@@ -32,8 +32,9 @@ internal object Env {
 
     val ldkRgsServerUrl
         get() = when (network) {
-            Network.BITCOIN -> "https://rgs.blocktank.to/snapshot/"
+            Network.BITCOIN -> "https://rgs.blocktank.to/snapshot"
             Network.TESTNET -> "https://rapidsync.lightningdevkit.org/testnet/snapshot"
+            Network.REGTEST -> "https://bitkit.stag0.blocktank.to/rgs/snapshot"
             else -> null
         }
 
diff --git a/app/src/main/java/to/bitkit/services/LightningService.kt b/app/src/main/java/to/bitkit/services/LightningService.kt
index 9b27c25b3..e91311046 100644
--- a/app/src/main/java/to/bitkit/services/LightningService.kt
+++ b/app/src/main/java/to/bitkit/services/LightningService.kt
@@ -143,10 +143,10 @@ class LightningService @Inject constructor(
     private suspend fun Builder.configureGossipSource(customRgsServerUrl: String?) {
         val rgsServerUrl = customRgsServerUrl ?: settingsStore.data.first().rgsServerUrl
         if (rgsServerUrl != null) {
-            Logger.info("Using gossip source rgs url: $rgsServerUrl")
+            Logger.info("Using gossip source: RGS server '$rgsServerUrl'")
             setGossipSourceRgs(rgsServerUrl)
         } else {
-            Logger.info("Using gossip source p2p")
+            Logger.info("Using gossip source: P2P")
             setGossipSourceP2p()
         }
     }
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveConfirmScreen.kt
index 805c70855..dd6d3180e 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveConfirmScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveConfirmScreen.kt
@@ -3,10 +3,8 @@ package to.bitkit.ui.screens.wallets.receive
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/to/bitkit/ui/settings/lightning/components/ChannelStatusView.kt b/app/src/main/java/to/bitkit/ui/settings/lightning/components/ChannelStatusView.kt
index 900bac926..e60b4d2e0 100644
--- a/app/src/main/java/to/bitkit/ui/settings/lightning/components/ChannelStatusView.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/lightning/components/ChannelStatusView.kt
@@ -59,7 +59,7 @@ fun ChannelStatusView(
     }
 }
 
-@Suppress("CyclomaticComplexMethod")
+@Suppress("CyclomaticComplexMethod", "ReturnCount")
 @Composable
 private fun getStatusInfo(
     channel: ChannelUi,