diff --git a/src/backend.rs b/src/backend.rs
index 0f13657d..7db4be50 100644
--- a/src/backend.rs
+++ b/src/backend.rs
@@ -113,8 +113,7 @@ impl PieceGetterWrapper {
     }
 }
 
-// TODO: Derive `Debug` after https://github.com/subspace/subspace/pull/2573
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 struct WeakPieceGetterWrapper {
     farmer_piece_getter: WeakFarmerPieceGetter<
         SegmentCommitmentPieceValidator<MaybeNodeRpcClient>,
diff --git a/src/backend/farmer.rs b/src/backend/farmer.rs
index 07653b8f..c91a5f54 100644
--- a/src/backend/farmer.rs
+++ b/src/backend/farmer.rs
@@ -389,9 +389,7 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu
         .map(|single_disk_farm| async {
             InitialFarmState {
                 total_sectors_count: single_disk_farm.total_sectors_count(),
-                // TODO: Should be `SectorSize` from the beginning
-                plotted_sectors_count: single_disk_farm.plotted_sectors_count().await
-                    as SectorIndex,
+                plotted_sectors_count: single_disk_farm.plotted_sectors_count().await,
             }
         })
         .collect::<FuturesOrdered<_>>()