diff --git a/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt
index 42a6a90f4..98e3db5fe 100644
--- a/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt
+++ b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt
@@ -27,6 +27,7 @@ import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.State
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -127,10 +128,10 @@ class PullRefreshState
         private val adjustedDistancePulled by derivedStateOf { distancePulled * DRAG_MULTIPLIER }
 
         private var _refreshing by mutableStateOf(false)
-        private var _position by mutableStateOf(0f)
-        private var distancePulled by mutableStateOf(0f)
-        private var _threshold by mutableStateOf(threshold)
-        private var refreshingOffsetState by mutableStateOf(refreshingOffset)
+        private var _position by mutableFloatStateOf(0f)
+        private var distancePulled by mutableFloatStateOf(0f)
+        private var _threshold by mutableFloatStateOf(threshold)
+        private var refreshingOffsetState by mutableFloatStateOf(refreshingOffset)
 
         internal fun onPull(pullDelta: Float): Float {
             if (_refreshing) return 0f // Already refreshing, do nothing.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt
index 2882d4179..d5dab835a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt
@@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -90,7 +91,7 @@ fun AudioWaveformReadOnly(
     val spikeTotalWidthState =
         remember(spikeWidth, spikePadding) { spikeWidthState + spikePaddingState }
     var canvasSize by remember { mutableStateOf(Size(0f, 0f)) }
-    var spikes by remember { mutableStateOf(0F) }
+    var spikes by remember { mutableFloatStateOf(0F) }
     val spikesAmplitudes =
         remember(amplitudes, spikes, amplitudeType) {
             amplitudes.toDrawableAmplitudes(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
index b50ffcc27..1670033ce 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
@@ -51,6 +51,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -513,7 +514,7 @@ fun ZapVote(
         )
     }
 
-    var zappingProgress by remember { mutableStateOf(0f) }
+    var zappingProgress by remember { mutableFloatStateOf(0f) }
     var showErrorMessageDialog by remember { mutableStateOf<StringToastMsg?>(null) }
 
     val context = LocalContext.current
@@ -658,7 +659,7 @@ fun ZapVote(
             } else {
                 Spacer(Modifier.width(3.dp))
                 CircularProgressIndicator(
-                    progress = zappingProgress,
+                    progress = { zappingProgress },
                     modifier = Modifier.size(14.dp),
                     strokeWidth = 2.dp,
                 )
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt
index f9476e789..d2adaaef0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt
@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -42,7 +43,7 @@ data class PollOption(
     val option: Int,
     val descriptor: String,
     var zappedValue: MutableState<BigDecimal> = mutableStateOf(BigDecimal.ZERO),
-    var tally: MutableState<Float> = mutableStateOf(0f),
+    var tally: MutableState<Float> = mutableFloatStateOf(0f),
     var consensusThreadhold: MutableState<Boolean> = mutableStateOf(false),
     var zappedByLoggedIn: MutableState<Boolean> = mutableStateOf(false),
 )
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/invoice/InvoiceRequest.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/invoice/InvoiceRequest.kt
index 15da2a882..803494b59 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/invoice/InvoiceRequest.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/invoice/InvoiceRequest.kt
@@ -35,6 +35,7 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -125,7 +126,7 @@ fun InvoiceRequest(
         HorizontalDivider(thickness = DividerThickness)
 
         var message by remember { mutableStateOf("") }
-        var amount by remember { mutableStateOf(1000L) }
+        var amount by remember { mutableLongStateOf(1000L) }
 
         OutlinedTextField(
             label = { Text(text = stringRes(R.string.note_to_receiver)) },
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/zapsplits/SplitBuilder.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/zapsplits/SplitBuilder.kt
index 562f4b5a3..f28600ad0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/zapsplits/SplitBuilder.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/zapsplits/SplitBuilder.kt
@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.ui.note.creators.zapsplits
 
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import kotlin.math.abs
@@ -125,5 +126,5 @@ class SplitItem<T>(
     val key: T,
 ) {
     // 0 to 1
-    var percentage by mutableStateOf(0f)
+    var percentage by mutableFloatStateOf(0f)
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt
index 7efa82b3b..d91f3affa 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt
@@ -35,6 +35,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -232,7 +233,7 @@ class EditState {
     private var modificationToShowIndex: Int = -1
 
     val modificationToShow: MutableState<Note?> = mutableStateOf(null)
-    val showingVersion: MutableState<Int> = mutableStateOf(0)
+    val showingVersion: MutableState<Int> = mutableIntStateOf(0)
 
     fun hasModificationsToShow(): Boolean = modificationsList.isNotEmpty()
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedSettingsState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedSettingsState.kt
index 8dc707f78..e8818fac3 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedSettingsState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedSettingsState.kt
@@ -24,6 +24,7 @@ import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.window.layout.DisplayFeature
@@ -49,7 +50,7 @@ class SharedSettingsState {
     var gallerySet by mutableStateOf(ProfileGalleryType.CLASSIC)
 
     var isOnMobileOrMeteredConnection by mutableStateOf(false)
-    var currentNetworkId by mutableStateOf(0L)
+    var currentNetworkId by mutableLongStateOf(0L)
 
     var windowSizeClass = mutableStateOf<WindowSizeClass?>(null)
     var displayFeatures = mutableStateOf<List<DisplayFeature>>(emptyList())
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/report/ReportNoteDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/report/ReportNoteDialog.kt
index 70122e622..96fd31e2b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/report/ReportNoteDialog.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/report/ReportNoteDialog.kt
@@ -45,6 +45,7 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -89,7 +90,7 @@ fun ReportNoteDialog(
 
     val reasonOptions = remember { reportTypes.map { TitleExplainer(it.second) }.toImmutableList() }
     var additionalReason by remember { mutableStateOf("") }
-    var selectedReason by remember { mutableStateOf(-1) }
+    var selectedReason by remember { mutableIntStateOf(-1) }
 
     Dialog(
         onDismissRequest = onDismiss,
diff --git a/quartz/src/test/java/com/vitorpamplona/quartz/nip01Core/hints/HintIndexerTest.kt b/quartz/src/test/java/com/vitorpamplona/quartz/nip01Core/hints/HintIndexerTest.kt
index 49b463648..5fd765b83 100644
--- a/quartz/src/test/java/com/vitorpamplona/quartz/nip01Core/hints/HintIndexerTest.kt
+++ b/quartz/src/test/java/com/vitorpamplona/quartz/nip01Core/hints/HintIndexerTest.kt
@@ -22,7 +22,6 @@ package com.vitorpamplona.quartz.nip01Core.hints
 
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
-import com.vitorpamplona.quartz.nip01Core.hints.HintIndexerTest.Companion.indexer
 import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
 import com.vitorpamplona.quartz.utils.RandomInstance
 import com.vitorpamplona.quartz.utils.usedMemoryMb