diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt
index 7e35b73f..80966be1 100644
--- a/app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt
+++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt
@@ -107,19 +107,19 @@ class BluetoothConnectionManager(
                 // Start power manager
                 powerManager.start()
                 
-                // // Start server manager
-                // if (!serverManager.start()) {
-                //     Log.e(TAG, "Failed to start server manager")
-                //     this@BluetoothConnectionManager.isActive = false
-                //     return@launch
-                // }
+                // Start server manager
+                if (!serverManager.start()) {
+                    Log.e(TAG, "Failed to start server manager")
+                    this@BluetoothConnectionManager.isActive = false
+                    return@launch
+                }
                 
-                // // Start client manager
-                // if (!clientManager.start()) {
-                //     Log.e(TAG, "Failed to start client manager")
-                //     this@BluetoothConnectionManager.isActive = false
-                //     return@launch
-                // }
+                // Start client manager
+                if (!clientManager.start()) {
+                    Log.e(TAG, "Failed to start client manager")
+                    this@BluetoothConnectionManager.isActive = false
+                    return@launch
+                }
                 
                 Log.i(TAG, "Bluetooth services started successfully")
             }
diff --git a/app/src/main/java/com/bitchat/android/wallet/service/CashuService.kt b/app/src/main/java/com/bitchat/android/wallet/service/CashuService.kt
index 34db01c9..c16ccd29 100644
--- a/app/src/main/java/com/bitchat/android/wallet/service/CashuService.kt
+++ b/app/src/main/java/com/bitchat/android/wallet/service/CashuService.kt
@@ -237,7 +237,7 @@ class CashuService {
                     memo = sendMemo,
                     amountSplitTarget = FfiSplitTarget.DEFAULT,
                     sendKind = FfiSendKind.OnlineExact,
-                    includeFee = true,
+                    includeFee = false,
                     metadata = emptyMap(),
                     maxProofs = null
                 )
@@ -288,7 +288,7 @@ class CashuService {
 
                 Log.d(TAG, "FFI amount: ${ffiAmount}")
 
-                Result.success(amount)
+                Result.success(ffiAmount.value.toLong())
                 
             } catch (e: FfiException) {
                 Log.e(TAG, "CDK FFI error receiving token: ${e.message}")