diff --git a/libsession-util/src/main/java/network/loki/messenger/libsession_util/util/BlindKeyAPI.kt b/libsession-util/src/main/java/network/loki/messenger/libsession_util/util/BlindKeyAPI.kt
index 8f57caf071..cd3dac3af2 100644
--- a/libsession-util/src/main/java/network/loki/messenger/libsession_util/util/BlindKeyAPI.kt
+++ b/libsession-util/src/main/java/network/loki/messenger/libsession_util/util/BlindKeyAPI.kt
@@ -1,10 +1,15 @@
 package network.loki.messenger.libsession_util.util
 
 object BlindKeyAPI {
-    init {
+    private val loadLibrary by lazy {
         System.loadLibrary("session_util")
     }
 
+    init {
+        // Ensure the library is loaded at initialization
+        loadLibrary
+    }
+
     external fun blindVersionKeyPair(ed25519SecretKey: ByteArray): KeyPair
     external fun blindVersionSign(ed25519SecretKey: ByteArray, timestamp: Long): ByteArray
 }
\ No newline at end of file
diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerApi.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerApi.kt
index 2543983cd9..fb9c014a15 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerApi.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerApi.kt
@@ -151,11 +151,12 @@ object FileServerApi {
         val result = send(request).await()
 
         // map out the result
-        val json = JsonUtil.fromJson(result, Map::class.java)
-        val statusCode = json.getOrDefault("status_code", 0) as Int
-        val version = json.getOrDefault("result", "") as String
-        val updated = json.getOrDefault("updated", 0.0) as Double
-
-        return VersionData(statusCode, version, updated)
+        return JsonUtil.fromJson(result, Map::class.java).let {
+            VersionData(
+                statusCode = it["status_code"] as? Int ?: 0,
+                version = it["result"] as? String ?: "",
+                updated = it["updated"] as? Double ?: 0.0
+            )
+        }
     }
 }
\ No newline at end of file