fixes

Author: nivi-apple

src/darwin/Framework/CHIP/MTRDevice.mm

@@ -2848,7 +2848,6 @@ - (void)_pruneOrphanedEndpointsAndClusters:(MTRAttributePath *)attributePath
                             [dataStoreClusterDataCopy removeObjectForKey:path];
                             [dataStoreClusterDataCopy setObject:clusterData forKey:path];
                             [self.deviceController.controllerDataStore storeClusterData:dataStoreClusterDataCopy forNodeID:self.nodeID];
-                            dataStoreClusterData = [NSMutableDictionary dictionaryWithDictionary:[self.deviceController.controllerDataStore getStoredClusterDataForNodeID:self.nodeID]];
                         }
                     }
                     [self _removeCachedAttributeValue:path forPath:attributePath];

src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.mm

@@ -455,7 +455,7 @@ - (BOOL)_deleteEndpointIndex:(NSNumber *)endpointID forNodeID:(NSNumber *)nodeID
         return NO;
     }
 
-    NSMutableArray * endpointIndex = [NSMutableArray arrayWithArray:[self _fetchEndpointIndexForNodeID:nodeID]];
+    NSMutableArray * endpointIndex = [[self _fetchEndpointIndexForNodeID:nodeID] mutableCopy];
     if (endpointIndex == nil) {
         return NO;
     }