diff --git a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/mediaServers/UploadFallbackTest.kt b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/mediaServers/UploadFallbackTest.kt
index 9aeaee304e..4680301de8 100644
--- a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/mediaServers/UploadFallbackTest.kt
+++ b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/mediaServers/UploadFallbackTest.kt
@@ -34,7 +34,7 @@ class UploadFallbackTest {
     }
 
     @Test
-    fun `a server is never tried twice, even under another spelling`() {
+    fun `a server is never tried twice even under another spelling`() {
         val primalAgain = ServerName("primal", "https://BLOSSOM.PRIMAL.NET")
         assertEquals(listOf(primal, band), blossomUploadOrder(primal, listOf(primalAgain, band, band)))
     }
diff --git a/commons/src/iosMain/kotlin/com/vitorpamplona/amethyst/commons/preview/CharsetDecoder.kt b/commons/src/iosMain/kotlin/com/vitorpamplona/amethyst/commons/preview/CharsetDecoder.kt
index cf70fa5533..445fb83d3a 100644
--- a/commons/src/iosMain/kotlin/com/vitorpamplona/amethyst/commons/preview/CharsetDecoder.kt
+++ b/commons/src/iosMain/kotlin/com/vitorpamplona/amethyst/commons/preview/CharsetDecoder.kt
@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.commons.preview
 
+import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.addressOf
 import kotlinx.cinterop.usePinned
@@ -41,7 +42,7 @@ import platform.Foundation.create
  * to their `NSStringEncoding`; anything else falls back to UTF-8 (matching the
  * "defaults to UTF-8" behaviour of the charset sniffer).
  */
-@OptIn(ExperimentalForeignApi::class)
+@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
 actual fun decodeBytes(
     bytes: ByteArray,
     charsetName: String?,
@@ -55,7 +56,7 @@ actual fun decodeBytes(
             NSData.create(bytes = pinned.addressOf(0), length = bytes.size.toULong())
         }
 
-    return (NSString.create(data, encoding) as String?)
+    return NSString.create(data = data, encoding = encoding)?.toString()
         ?: bytes.decodeToString()
 }