diff --git a/src/Simplex/Messaging/Agent/Store/AgentStore.hs b/src/Simplex/Messaging/Agent/Store/AgentStore.hs
index 711f6f05be..37c2c13cbd 100644
--- a/src/Simplex/Messaging/Agent/Store/AgentStore.hs
+++ b/src/Simplex/Messaging/Agent/Store/AgentStore.hs
@@ -457,7 +457,7 @@ checkConfirmedSndQueueExists_ db SndQueue {server, sndId} =
     DB.query
       db
       ( "SELECT 1 FROM snd_queues WHERE host = ? AND port = ? AND snd_id = ? AND status != ? LIMIT 1"
-#if defined(dpPostgres)
+#if defined(dbPostgres)
           <> " FOR UPDATE"
 #endif
       )
diff --git a/src/Simplex/Messaging/Util.hs b/src/Simplex/Messaging/Util.hs
index 3eab9c923b..b032fe884a 100644
--- a/src/Simplex/Messaging/Util.hs
+++ b/src/Simplex/Messaging/Util.hs
@@ -350,6 +350,7 @@ groupAllOn f = groupOn f . sortOn f
 -- n must be > 0
 toChunks :: Int -> [a] -> [NonEmpty a]
 toChunks _ [] = []
+toChunks 0 (x : xs) = [x :| xs]
 toChunks n xs =
   let (ys, xs') = splitAt n xs
    in maybe id (:) (L.nonEmpty ys) (toChunks n xs')
diff --git a/src/Simplex/RemoteControl/Types.hs b/src/Simplex/RemoteControl/Types.hs
index dfeeb9477c..48c623e7cb 100644
--- a/src/Simplex/RemoteControl/Types.hs
+++ b/src/Simplex/RemoteControl/Types.hs
@@ -13,7 +13,6 @@ module Simplex.RemoteControl.Types
     RCPVersion,
     VersionRCP,
     VersionRangeRCP,
-    IpProbe (..),
     RCHostHello (..),
     RCCtrlHello (..),
     RCHostPairing (..),
@@ -141,16 +140,6 @@ currentRCPVersion = VersionRCP 1
 supportedRCPVRange :: VersionRangeRCP
 supportedRCPVRange = mkVersionRange (VersionRCP 1) currentRCPVersion
 
-data IpProbe = IpProbe
-  { versionRange :: VersionRangeRCP,
-    randomNonce :: ByteString
-  }
-  deriving (Show)
-
-instance Encoding IpProbe where
-  smpEncode IpProbe {versionRange, randomNonce} = smpEncode (versionRange, 'I', randomNonce)
-  smpP = IpProbe <$> (smpP <* "I") *> smpP
-
 -- * Session
 
 data RCHostHello = RCHostHello