diff --git a/api/v1alpha1/nnf_node_block_storage_types.go b/api/v1alpha1/nnf_node_block_storage_types.go
index 5f59ebd8b..6935c0af2 100644
--- a/api/v1alpha1/nnf_node_block_storage_types.go
+++ b/api/v1alpha1/nnf_node_block_storage_types.go
@@ -72,7 +72,7 @@ type NnfNodeBlockStorageAccessStatus struct {
 }
 
 type NnfNodeBlockStorageAllocationStatus struct {
-	// Accesses is map of node name to the access status
+	// Accesses is a map of node name to the access status
 	Accesses map[string]NnfNodeBlockStorageAccessStatus `json:"accesses,omitempty"`
 
 	// List of NVMe namespaces used by this allocation
diff --git a/internal/controller/nnf_clientmount_controller.go b/internal/controller/nnf_clientmount_controller.go
index 3df6d761e..40a70dfc8 100644
--- a/internal/controller/nnf_clientmount_controller.go
+++ b/internal/controller/nnf_clientmount_controller.go
@@ -229,6 +229,9 @@ func (r *NnfClientMountReconciler) fakeNnfNodeStorage(clientMount *dwsv1alpha2.C
 	// These labels aren't exactly right (NnfStorage owns NnfNodeStorage), but the
 	// labels that are important for doing the mount are there and correct
 	dwsv1alpha2.InheritParentLabels(nnfNodeStorage, clientMount)
+	labels := nnfNodeStorage.GetLabels()
+	labels[nnfv1alpha1.DirectiveIndexLabel] = clientMount.Spec.Mounts[index].Device.DeviceReference.Data
+	nnfNodeStorage.SetLabels(labels)
 
 	nnfNodeStorage.Spec.BlockReference = corev1.ObjectReference{
 		Name:      "fake",