diff --git a/ydb/core/change_exchange/change_sender_common_ops.h b/ydb/core/change_exchange/change_sender_common_ops.h
index 7c472e704443..f2c02c0b595b 100644
--- a/ydb/core/change_exchange/change_sender_common_ops.h
+++ b/ydb/core/change_exchange/change_sender_common_ops.h
@@ -419,9 +419,11 @@ class TBaseChangeSender {
         if (partitionIds) {
             CreateMissingSenders(partitionIds);
         } else {
-            RecreateSenders(std::exchange(GonePartitions, {}));
+            RecreateSenders(GonePartitions);
         }
 
+        GonePartitions.clear();
+
         if (!Enqueued || !RequestRecords()) {
             SendRecords();
         }
diff --git a/ydb/core/scheme/scheme_tablecell.h b/ydb/core/scheme/scheme_tablecell.h
index d2abd9f5d548..0e501c10d587 100644
--- a/ydb/core/scheme/scheme_tablecell.h
+++ b/ydb/core/scheme/scheme_tablecell.h
@@ -541,6 +541,10 @@ class TSerializedCellVec {
         return Cells;
     }
 
+    explicit operator bool() const {
+        return !Cells.empty();
+    }
+
     static void Serialize(TString& res, TConstArrayRef<TCell> cells);
 
     static TString Serialize(TConstArrayRef<TCell> cells);
diff --git a/ydb/core/tx/datashard/change_sender_cdc_stream.cpp b/ydb/core/tx/datashard/change_sender_cdc_stream.cpp
index 980c269f15ca..ecf916263b6d 100644
--- a/ydb/core/tx/datashard/change_sender_cdc_stream.cpp
+++ b/ydb/core/tx/datashard/change_sender_cdc_stream.cpp
@@ -521,7 +521,6 @@ class TCdcChangeSenderMain
         TopicVersion = topicVersion;
 
         const auto& pqDesc = entry.PQGroupInfo->Description;
-        const auto& pqConfig = pqDesc.GetPQTabletConfig();
 
         PartitionToShard.clear();
         for (const auto& partition : pqDesc.GetPartitions()) {
diff --git a/ydb/core/tx/replication/service/table_writer_impl.h b/ydb/core/tx/replication/service/table_writer_impl.h
index 2af13fa22042..475aa3c351a2 100644
--- a/ydb/core/tx/replication/service/table_writer_impl.h
+++ b/ydb/core/tx/replication/service/table_writer_impl.h
@@ -342,7 +342,7 @@ class TLocalTableWriter
         if (TableVersion && TableVersion == entry.Self->Info.GetVersion().GetGeneralVersion()) {
             Y_ABORT_UNLESS(Initialized);
             Resolving = false;
-            return CreateSenders();
+            return this->CreateSenders();
         }
 
         auto schema = MakeIntrusive<TLightweightSchema>();