diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt
index 4fd7e9704be..113afce4407 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt
@@ -156,7 +156,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() {
         override fun visitNode(node: CFGNode<*>, data: IllegalScopeContext) {}
 
         override fun visitFunctionEnterNode(node: FunctionEnterNode, data: IllegalScopeContext) {
-            // TODO: this is not how CFG works, this should be done by FIR tree traversal. Especially considering that
+            // TODO, KT-59668: this is not how CFG works, this should be done by FIR tree traversal. Especially considering that
             //  none of these methods use anything from the CFG other than `node.fir`, which should've been a hint.
             data.enterScope(node.fir === rootFunction || node.fir.isInPlaceLambda())
         }
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirPropertyInitializationAnalyzer.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirPropertyInitializationAnalyzer.kt
index 0e4beee8529..9bb18ccb93f 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirPropertyInitializationAnalyzer.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirPropertyInitializationAnalyzer.kt
@@ -96,7 +96,7 @@ private fun PropertyInitializationInfoData.checkPropertyAccesses(
 
     for (node in graph.nodes) {
         when {
-            // TODO: `node.isUnion` - f({ x = 1 }, { x = 2 }) - which to report?
+            // TODO, KT-59669: `node.isUnion` - f({ x = 1 }, { x = 2 }) - which to report?
             //  Also this is currently indistinguishable from x = 1; f({}, {}).
 
             node is VariableDeclarationNode -> {
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/util/CfgTraverser.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/util/CfgTraverser.kt
index b999b43221d..d88911783cc 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/util/CfgTraverser.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/util/CfgTraverser.kt
@@ -35,7 +35,7 @@ private fun <I : ControlFlowInfo<I, *, *>> ControlFlowGraph.collectDataForNodeIn
                 changed = changed or (visitor.visitSubGraph(node, it) && it.collectDataForNodeInternal(direction, visitor, nodeMap))
             }
         }
-        // TODO: if data for previousNodes hasn't changed, then should be no need to recompute data for this one
+        // TODO, KT-59670: if data for previousNodes hasn't changed, then should be no need to recompute data for this one
         val union = node.isUnion
         val previousData = when (direction) {
             TraverseDirection.Forward -> node.previousCfgNodes