diff --git a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/message/TimestampAwareReplicaResponse.java b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/message/TimestampAwareReplicaResponse.java
index 0cbf84ab925..1f2af48b8d6 100644
--- a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/message/TimestampAwareReplicaResponse.java
+++ b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/message/TimestampAwareReplicaResponse.java
@@ -21,7 +21,6 @@
 
 /**
  * Replica response interface with a timestamp to adjust a hybrid logical clock.
- * TODO:IGNITE-17258 Add a specific response type for a replica listener. (@Transferable(ReplicaMessageGroup.TYPE_RESPONSE))
  */
 @Transferable(ReplicaMessageGroup.TIMESTAMP_AWARE_REPLICA_RESPONSE)
 public interface TimestampAwareReplicaResponse extends ReplicaResponse, TimestampAware {
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index 5fb8881cf8c..78cdc720e53 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -849,7 +849,7 @@ private RaftGroupOptions groupOptionsForPartition(
             raftGroupOptions = RaftGroupOptions.forPersistentStores();
         }
 
-        //TODO Revisit peers String representation: https://issues.apache.org/jira/browse/IGNITE-17420
+        //TODO Revisit peers String representation: https://issues.apache.org/jira/browse/IGNITE-17814
         raftGroupOptions.snapshotStorageFactory(new PartitionSnapshotStorageFactory(
                 raftMgr.topologyService(),
                 //TODO IGNITE-17302 Use miniumum from mv storage and tx state storage.
diff --git a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TransactionImpl.java b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TransactionImpl.java
index 262122cbcd7..150a241e91f 100644
--- a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TransactionImpl.java
+++ b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TransactionImpl.java
@@ -28,6 +28,7 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import org.apache.ignite.internal.logger.IgniteLogger;
 import org.apache.ignite.internal.logger.Loggers;
 import org.apache.ignite.internal.tx.InternalTransaction;
@@ -54,10 +55,10 @@ public class TransactionImpl implements InternalTransaction {
     private final TxManager txManager;
 
     /** Enlisted replication groups: replication group id -> (primary replica node, raft term). */
-    private Map<String, IgniteBiTuple<ClusterNode, Long>> enlisted = new ConcurrentSkipListMap<>();
+    private final Map<String, IgniteBiTuple<ClusterNode, Long>> enlisted = new ConcurrentSkipListMap<>();
 
     /** Enlisted operation futures in this transaction. */
-    private volatile List<CompletableFuture<?>>  enlistedResults = new ArrayList<>();
+    private final List<CompletableFuture<?>> enlistedResults = new CopyOnWriteArrayList<>();
 
     /**
      * The constructor.