diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.mm
index 66a2838026c029..26d68921591f75 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.mm
@@ -467,7 +467,7 @@ - (BOOL)_deleteAttributeValueForNodeID:(NSNumber *)nodeID endpointID:(NSNumber *
                 [self clearStoredAttributesForNodeID:nodeID];
             }
 
-            MTR_LOG_INFO("Fetch got no value for endpointIndex @ %llu", nodeID.unsignedLongLongValue);
+            MTR_LOG_INFO("Fetch got no value for endpointIndex @ node 0x%016llX", nodeID.unsignedLongLongValue);
             attributesToReturn = nil;
             return;
         }
@@ -476,7 +476,7 @@ - (BOOL)_deleteAttributeValueForNodeID:(NSNumber *)nodeID endpointID:(NSNumber *
         NSArray<NSNumber *> * endpointIndex = [self _fetchEndpointIndexForNodeID:nodeID];
 
 #if ATTRIBUTE_CACHE_VERBOSE_LOGGING
-        MTR_LOG_INFO("Fetch got %lu values for endpointIndex @ %llu", static_cast<unsigned long>(endpointIndex.count), nodeID.unsignedLongLongValue);
+        MTR_LOG_INFO("Fetch got %lu values for endpointIndex @ node 0x%016llX", static_cast<unsigned long>(endpointIndex.count), nodeID.unsignedLongLongValue);
 #endif
 
         for (NSNumber * endpointID in endpointIndex) {
@@ -484,7 +484,7 @@ - (BOOL)_deleteAttributeValueForNodeID:(NSNumber *)nodeID endpointID:(NSNumber *
             NSArray<NSNumber *> * clusterIndex = [self _fetchClusterIndexForNodeID:nodeID endpointID:endpointID];
 
 #if ATTRIBUTE_CACHE_VERBOSE_LOGGING
-            MTR_LOG_INFO("Fetch got %lu values for clusterIndex @ %llu:0x%04X", static_cast<unsigned long>(clusterIndex.count), nodeID.unsignedLongLongValue, endpointID.unsignedShortValue);
+            MTR_LOG_INFO("Fetch got %lu values for clusterIndex @ node 0x%016llX %u", static_cast<unsigned long>(clusterIndex.count), nodeID.unsignedLongLongValue, endpointID.unsignedShortValue);
 #endif
 
             for (NSNumber * clusterID in clusterIndex) {
@@ -492,14 +492,14 @@ - (BOOL)_deleteAttributeValueForNodeID:(NSNumber *)nodeID endpointID:(NSNumber *
                 NSArray<NSNumber *> * attributeIndex = [self _fetchAttributeIndexForNodeID:nodeID endpointID:endpointID clusterID:clusterID];
 
 #if ATTRIBUTE_CACHE_VERBOSE_LOGGING
-                MTR_LOG_INFO("Fetch got %lu values for attributeIndex @ %llu:0x%04X:0x%08lX", static_cast<unsigned long>(attributeIndex.count), nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue);
+                MTR_LOG_INFO("Fetch got %lu values for attributeIndex @ node 0x%016llX endpoint %u cluster 0x%08lX", static_cast<unsigned long>(attributeIndex.count), nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue);
 #endif
 
                 for (NSNumber * attributeID in attributeIndex) {
                     NSDictionary * value = [self _fetchAttributeValueForNodeID:nodeID endpointID:endpointID clusterID:clusterID attributeID:attributeID];
 
 #if ATTRIBUTE_CACHE_VERBOSE_LOGGING
-                    MTR_LOG_INFO("Fetch got %u values for attribute value @ %llu:0x%04X:0x%08lX:0x%08lX", value ? 1 : 0, nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue, attributeID.unsignedLongValue);
+                    MTR_LOG_INFO("Fetch got %u values for attribute value @ node 0x%016llX endpoint %u cluster 0x%08lX attribute 0x%08lX", value ? 1 : 0, nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue, attributeID.unsignedLongValue);
 #endif
 
                     if (value) {
@@ -538,22 +538,22 @@ - (void)_pruneEmptyStoredAttributesBranches
 
     // Fetch node index
     NSArray<NSNumber *> * nodeIndex = [self _fetchNodeIndex];
-    NSMutableArray<NSNumber *> * nodeIndexCopy = nodeIndex.mutableCopy;
+    NSMutableArray<NSNumber *> * nodeIndexCopy = [nodeIndex mutableCopy];
 
     for (NSNumber * nodeID in nodeIndex) {
         // Fetch endpoint index
         NSArray<NSNumber *> * endpointIndex = [self _fetchEndpointIndexForNodeID:nodeID];
-        NSMutableArray<NSNumber *> * endpointIndexCopy = endpointIndex.mutableCopy;
+        NSMutableArray<NSNumber *> * endpointIndexCopy = [endpointIndex mutableCopy];
 
         for (NSNumber * endpointID in endpointIndex) {
             // Fetch endpoint index
             NSArray<NSNumber *> * clusterIndex = [self _fetchClusterIndexForNodeID:nodeID endpointID:endpointID];
-            NSMutableArray<NSNumber *> * clusterIndexCopy = clusterIndex.mutableCopy;
+            NSMutableArray<NSNumber *> * clusterIndexCopy = [clusterIndex mutableCopy];
 
             for (NSNumber * clusterID in clusterIndex) {
                 // Fetch endpoint index
                 NSArray<NSNumber *> * attributeIndex = [self _fetchAttributeIndexForNodeID:nodeID endpointID:endpointID clusterID:clusterID];
-                NSMutableArray<NSNumber *> * attributeIndexCopy = attributeIndex.mutableCopy;
+                NSMutableArray<NSNumber *> * attributeIndexCopy = [attributeIndex mutableCopy];
 
                 for (NSNumber * attributeID in attributeIndex) {
                     NSDictionary * value = [self _fetchAttributeValueForNodeID:nodeID endpointID:endpointID clusterID:clusterID attributeID:attributeID];
@@ -571,8 +571,10 @@ - (void)_pruneEmptyStoredAttributesBranches
                         [clusterIndexCopy removeObject:clusterID];
                         success = [self _deleteAttributeIndexForNodeID:nodeID endpointID:endpointID clusterID:clusterID];
                     }
-                    storeFailures++;
-                    MTR_LOG_INFO("Store failed in _pruneEmptyStoredAttributesBranches for attributeIndex (%lu) @ %llu:0x%04X:0x%08lX", static_cast<unsigned long>(attributeIndexCopy.count), nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue);
+                    if (!success) {
+                        storeFailures++;
+                        MTR_LOG_INFO("Store failed in _pruneEmptyStoredAttributesBranches for attributeIndex (%lu) @ node 0x%016llX endpoint %u cluster 0x%08lX", static_cast<unsigned long>(attributeIndexCopy.count), nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue);
+                    }
                 }
             }
 
@@ -586,7 +588,7 @@ - (void)_pruneEmptyStoredAttributesBranches
                 }
                 if (!success) {
                     storeFailures++;
-                    MTR_LOG_INFO("Store failed in _pruneEmptyStoredAttributesBranches for clusterIndex (%lu) @ %llu:0x%04X", static_cast<unsigned long>(clusterIndexCopy.count), nodeID.unsignedLongLongValue, endpointID.unsignedShortValue);
+                    MTR_LOG_INFO("Store failed in _pruneEmptyStoredAttributesBranches for clusterIndex (%lu) @ node 0x%016llX endpoint %u", static_cast<unsigned long>(clusterIndexCopy.count), nodeID.unsignedLongLongValue, endpointID.unsignedShortValue);
                 }
             }
         }
@@ -601,7 +603,7 @@ - (void)_pruneEmptyStoredAttributesBranches
             }
             if (!success) {
                 storeFailures++;
-                MTR_LOG_INFO("Store failed in _pruneEmptyStoredAttributesBranches for endpointIndex (%lu) @ %llu", static_cast<unsigned long>(endpointIndexCopy.count), nodeID.unsignedLongLongValue);
+                MTR_LOG_INFO("Store failed in _pruneEmptyStoredAttributesBranches for endpointIndex (%lu) @ node 0x%016llX", static_cast<unsigned long>(endpointIndexCopy.count), nodeID.unsignedLongLongValue);
             }
         }
     }
@@ -634,7 +636,7 @@ - (void)storeAttributeValues:(NSArray<NSDictionary *> *)dataValues forNodeID:(NS
             NSDictionary * value = dataValue[MTRDataKey];
 
 #if ATTRIBUTE_CACHE_VERBOSE_LOGGING
-            MTR_LOG_INFO("Attempt to store attribute value @ %llu:0x%04X:0x%08lX:0x%08lX", nodeID.unsignedLongLongValue, path.endpoint.unsignedShortValue, path.cluster.unsignedLongValue, path.attribute.unsignedLongValue);
+            MTR_LOG_INFO("Attempt to store attribute value @ node 0x%016llX endpoint %u cluster 0x%08lX attribute 0x%08lX", nodeID.unsignedLongLongValue, path.endpoint.unsignedShortValue, path.cluster.unsignedLongValue, path.attribute.unsignedLongValue);
 #endif
 
             BOOL storeFailed = NO;
@@ -662,7 +664,7 @@ - (void)storeAttributeValues:(NSArray<NSDictionary *> *)dataValues forNodeID:(NS
             }
             if (storeFailed) {
                 storeFailures++;
-                MTR_LOG_INFO("Store failed for endpointIndex @ %llu", nodeID.unsignedLongLongValue);
+                MTR_LOG_INFO("Store failed for endpointIndex @ node 0x%016llX", nodeID.unsignedLongLongValue);
                 continue;
             }
 
@@ -676,7 +678,7 @@ - (void)storeAttributeValues:(NSArray<NSDictionary *> *)dataValues forNodeID:(NS
             }
             if (storeFailed) {
                 storeFailures++;
-                MTR_LOG_INFO("Store failed for clusterIndex @ %llu:0x%04X", nodeID.unsignedLongLongValue, path.endpoint.unsignedShortValue);
+                MTR_LOG_INFO("Store failed for clusterIndex @ node 0x%016llX endpoint %u", nodeID.unsignedLongLongValue, path.endpoint.unsignedShortValue);
                 continue;
             }
 
@@ -693,7 +695,7 @@ - (void)storeAttributeValues:(NSArray<NSDictionary *> *)dataValues forNodeID:(NS
             }
             if (storeFailed) {
                 storeFailures++;
-                MTR_LOG_INFO("Store failed for attributeIndex @ %llu:0x%04X:0x%08lX", nodeID.unsignedLongLongValue, path.endpoint.unsignedShortValue, path.cluster.unsignedLongValue);
+                MTR_LOG_INFO("Store failed for attributeIndex @ node 0x%016llX endpoint %u cluster 0x%08lX", nodeID.unsignedLongLongValue, path.endpoint.unsignedShortValue, path.cluster.unsignedLongValue);
                 continue;
             }
 
@@ -701,7 +703,7 @@ - (void)storeAttributeValues:(NSArray<NSDictionary *> *)dataValues forNodeID:(NS
             storeFailed = ![self _storeAttributeValue:value forNodeID:nodeID endpointID:path.endpoint clusterID:path.cluster attributeID:path.attribute];
             if (storeFailed) {
                 storeFailures++;
-                MTR_LOG_INFO("Store failed for attribute value @ %llu:0x%04X:0x%08lX:0x%08lX", nodeID.unsignedLongLongValue, path.endpoint.unsignedShortValue, path.cluster.unsignedLongValue, path.attribute.unsignedLongValue);
+                MTR_LOG_INFO("Store failed for attribute value @ node 0x%016llX endpoint %u cluster 0x%08lX attribute 0x%08lX", nodeID.unsignedLongLongValue, path.endpoint.unsignedShortValue, path.cluster.unsignedLongValue, path.attribute.unsignedLongValue);
             }
         }
 
@@ -739,7 +741,7 @@ - (void)_clearStoredAttributesForNodeID:(NSNumber *)nodeID
             for (NSNumber * attributeID in attributeIndex) {
                 BOOL success = [self _deleteAttributeValueForNodeID:nodeID endpointID:endpointID clusterID:clusterID attributeID:attributeID];
                 if (!success) {
-                    MTR_LOG_INFO("Delete failed for attribute value @ %llu:0x%04X:0x%08lX:0x%08lX", nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue, attributeID.unsignedLongValue);
+                    MTR_LOG_INFO("Delete failed for attribute value @ node 0x%016llX endpoint %u cluster 0x%08lX attribute 0x%08lX", nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue, attributeID.unsignedLongValue);
                 } else {
                     attributesCleared++;
                 }
@@ -747,7 +749,7 @@ - (void)_clearStoredAttributesForNodeID:(NSNumber *)nodeID
 
             BOOL success = [self _deleteAttributeIndexForNodeID:nodeID endpointID:endpointID clusterID:clusterID];
             if (!success) {
-                MTR_LOG_INFO("Delete failed for attributeIndex @ %llu:0x%04X:0x%08lX", nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue);
+                MTR_LOG_INFO("Delete failed for attributeIndex @ node 0x%016llX endpoint %u cluster 0x%08lX", nodeID.unsignedLongLongValue, endpointID.unsignedShortValue, clusterID.unsignedLongValue);
             } else {
                 clustersCleared++;
             }
@@ -755,7 +757,7 @@ - (void)_clearStoredAttributesForNodeID:(NSNumber *)nodeID
 
         BOOL success = [self _deleteClusterIndexForNodeID:nodeID endpointID:endpointID];
         if (!success) {
-            MTR_LOG_INFO("Delete failed for clusterIndex @ %llu:0x%04X", nodeID.unsignedLongLongValue, endpointID.unsignedShortValue);
+            MTR_LOG_INFO("Delete failed for clusterIndex @ node 0x%016llX endpoint %u", nodeID.unsignedLongLongValue, endpointID.unsignedShortValue);
         } else {
             endpointsCleared++;
         }
@@ -763,7 +765,7 @@ - (void)_clearStoredAttributesForNodeID:(NSNumber *)nodeID
 
     BOOL success = [self _deleteEndpointIndexForNodeID:nodeID];
     if (!success) {
-        MTR_LOG_INFO("Delete failed for endpointrIndex @ %llu", nodeID.unsignedLongLongValue);
+        MTR_LOG_INFO("Delete failed for endpointrIndex @ node 0x%016llX", nodeID.unsignedLongLongValue);
     }
 
     MTR_LOG_INFO("clearStoredAttributesForNodeID: deleted endpoints %lu/%lu clusters %lu/%lu attributes %lu/%lu", static_cast<unsigned long>(endpointsCleared), static_cast<unsigned long>(endpointsClearAttempts), static_cast<unsigned long>(clustersCleared), static_cast<unsigned long>(clustersClearAttempts), static_cast<unsigned long>(attributesCleared), static_cast<unsigned long>(attributesClearAttempts));
@@ -774,7 +776,7 @@ - (void)clearStoredAttributesForNodeID:(NSNumber *)nodeID
     dispatch_async(_storageDelegateQueue, ^{
         [self _clearStoredAttributesForNodeID:nodeID];
         NSArray<NSNumber *> * nodeIndex = [self _fetchNodeIndex];
-        NSMutableArray<NSNumber *> * nodeIndexCopy = nodeIndex.mutableCopy;
+        NSMutableArray<NSNumber *> * nodeIndexCopy = [nodeIndex mutableCopy];
         [nodeIndexCopy removeObject:nodeID];
         if (nodeIndex.count != nodeIndexCopy.count) {
             BOOL success;