diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/AmberUtils.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/AmberUtils.kt
index 582bd6230..5575a4285 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/AmberUtils.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/AmberUtils.kt
@@ -35,14 +35,13 @@ object AmberUtils {
         intent.putExtra("type", signerType)
         intent.putExtra("pubKey", pubKey)
         intent.putExtra("id", id)
-        intent.`package` = "com.greenart7c3.nostrsigner.debug"
+        intent.`package` = "com.greenart7c3.nostrsigner"
         intentResult.launch(intent)
     }
 
     fun openAmber(event: EventInterface) {
         checkNotInMainThread()
         ServiceManager.shouldPauseService = false
-        content = ""
         isActivityRunning = true
         openAmber(
             event.toJson(),
@@ -52,14 +51,12 @@ object AmberUtils {
             event.id()
         )
         while (isActivityRunning) {
-            // do nothing
+            Thread.sleep(100)
         }
     }
 
     fun loginWithAmber() {
         checkNotInMainThread()
-        content = ""
-        isActivityRunning = true
         openAmber(
             "",
             SignerType.GET_PUBLIC_KEY,
@@ -67,9 +64,6 @@ object AmberUtils {
             "",
             ""
         )
-        while (isActivityRunning) {
-            // do nothing
-        }
     }
 
     fun decrypt(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
@@ -89,18 +83,16 @@ object AmberUtils {
     }
 
     fun encrypt(decryptedContent: String, pubKey: HexKey, signerType: SignerType = SignerType.NIP04_ENCRYPT) {
-        if (content.isBlank()) {
-            isActivityRunning = true
-            openAmber(
-                decryptedContent,
-                signerType,
-                IntentUtils.activityResultLauncher,
-                pubKey,
-                ""
-            )
-            while (isActivityRunning) {
-                // do nothing
-            }
+        isActivityRunning = true
+        openAmber(
+            decryptedContent,
+            signerType,
+            IntentUtils.activityResultLauncher,
+            pubKey,
+            "encrypt"
+        )
+        while (isActivityRunning) {
+            Thread.sleep(100)
         }
     }
 
@@ -114,7 +106,7 @@ object AmberUtils {
             event.id
         )
         while (isActivityRunning) {
-            // do nothing
+            Thread.sleep(100)
         }
     }
 }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/IntentUtils.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/IntentUtils.kt
index 36bb9a356..c2694cf37 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/IntentUtils.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/IntentUtils.kt
@@ -34,11 +34,11 @@ object IntentUtils {
             }
 
             val event = it.data?.getStringExtra("signature") ?: ""
+            AmberUtils.content = event
             val id = it.data?.getStringExtra("id") ?: ""
             if (id.isNotBlank()) {
                 AmberUtils.cachedDecryptedContent[id] = event
             }
-            AmberUtils.content = event
             AmberUtils.isActivityRunning = false
             ServiceManager.shouldPauseService = true
         }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt
index 1f634e236..f6dd82972 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt
@@ -12,6 +12,6 @@ object PackageUtils {
     }
 
     fun isAmberInstalled(context: Context): Boolean {
-        return isPackageInstalled(context, "com.greenart7c3.nostrsigner.debug")
+        return isPackageInstalled(context, "com.greenart7c3.nostrsigner")
     }
 }
diff --git a/benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/GiftWrapBenchmark.kt b/benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/GiftWrapBenchmark.kt
index e9f6ffe7a..64785b00d 100644
--- a/benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/GiftWrapBenchmark.kt
+++ b/benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/GiftWrapBenchmark.kt
@@ -34,7 +34,7 @@ class GiftWrapBenchmark {
         val events = NIP24Factory().createMsgNIP24(
             message,
             listOf(receiver.pubKey.toHexKey()),
-            sender.privKey!!
+            sender
         )
 
         Assert.assertEquals(expectedLength, events.map { it.toJson() }.joinToString("").length)
@@ -63,7 +63,7 @@ class GiftWrapBenchmark {
         val giftWrap = NIP24Factory().createMsgNIP24(
             message,
             listOf(receiver.pubKey.toHexKey()),
-            sender.privKey!!
+            sender
         ).first()
 
         val keyToUse = if (giftWrap.recipientPubKey() == sender.pubKey.toHexKey()) sender.privKey!! else receiver.privKey!!