diff --git a/crates/sc-proof-of-time/src/clock_master.rs b/crates/sc-proof-of-time/src/clock_master.rs
index cec86241d3..246741336c 100644
--- a/crates/sc-proof-of-time/src/clock_master.rs
+++ b/crates/sc-proof-of-time/src/clock_master.rs
@@ -110,6 +110,7 @@ where
         info!("clock_master::initialize: waiting for initialization ...");
         let delay = tokio::time::Duration::from_secs(1);
         let proofs = loop {
+            // TODO: Proper error handling or proof
             let tip = get_consensus_tip(
                 self.client.clone(),
                 self.sync_oracle.clone(),
@@ -131,6 +132,7 @@ where
 
             let proofs = tip.pot_pre_digest.proofs().cloned().unwrap_or_else(|| {
                 // Producing proofs starting from (genesis_slot + 1).
+                // TODO: Proper error handling or proof
                 let proof = self.proof_of_time.create(
                     PotSeed::from_block_hash(tip.block_hash),
                     Default::default(), // TODO: key from cmd line or BTC
diff --git a/crates/sc-proof-of-time/src/node_client.rs b/crates/sc-proof-of-time/src/node_client.rs
index 7bc2856314..091abddd8e 100644
--- a/crates/sc-proof-of-time/src/node_client.rs
+++ b/crates/sc-proof-of-time/src/node_client.rs
@@ -76,6 +76,7 @@ where
         info!("pot_client::initialize: waiting for initialization ...");
         let delay = tokio::time::Duration::from_secs(1);
         let proofs = loop {
+            // TODO: Proper error handling or proof
             let tip = get_consensus_tip(
                 self.client.clone(),
                 self.sync_oracle.clone(),
diff --git a/crates/subspace-service/src/lib.rs b/crates/subspace-service/src/lib.rs
index 1261ce32a7..9fcd815601 100644
--- a/crates/subspace-service/src/lib.rs
+++ b/crates/subspace-service/src/lib.rs
@@ -874,7 +874,7 @@ where
 
                 task_manager.spawn_essential_handle().spawn_blocking(
                     "subspace-proof-of-time-clock-master",
-                    Some("subspace-proof-of-time-clock-master"),
+                    Some("pot"),
                     async move {
                         clock_master.run().await;
                     },
@@ -890,7 +890,7 @@ where
                 );
                 task_manager.spawn_essential_handle().spawn_blocking(
                     "subspace-proof-of-time-client",
-                    Some("subspace-proof-of-time-client"),
+                    Some("pot"),
                     async move {
                         pot_client.run().await;
                     },