diff --git a/SqlSchemaCompare_Dev_to_DevRelease.scmp b/SqlSchemaCompare_Dev_to_DevRelease.scmp
index aa6eec8c..28697846 100644
--- a/SqlSchemaCompare_Dev_to_DevRelease.scmp
+++ b/SqlSchemaCompare_Dev_to_DevRelease.scmp
@@ -303,6 +303,10 @@
         <Name>RegisterDataTierApplication</Name>
         <Value>False</Value>
       </PropertyElementName>
+      <PropertyElementName>
+        <Name>PerformIndexOperationsOnline</Name>
+        <Value>False</Value>
+      </PropertyElementName>
       <PropertyElementName>
         <Name>RebuildIndexesOfflineForDataPhase</Name>
         <Value>False</Value>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index 633c8429..d42612de 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -320,6 +320,7 @@
         var company = _productDetailGridComponent!.ParentData as Company;
         if (company == null || company.OwnerId.IsNullOrEmpty())
         {
+            e.Cancel = true;
             _logger.Error($"OnProductGridItemSaving; company == null || company.OwnerId.IsNullOrEmpty(); company.OwnerId: {company?.OwnerId}");
             return;
         }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
index 3e6a20cb..e1517cbf 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
@@ -137,13 +137,13 @@
         {
             _logger.Debug($"DataItemSaving");
             
-            var profileId = Guid.NewGuid();
-            product.Profile = new Profile(profileId, product.Name);
-            product.ProfileId = profileId;
+            // var profileId = Guid.NewGuid();
+            // product.Profile = new Profile(profileId, product.Name);
+            // product.ProfileId = profileId;
 
-            var addressId = Guid.NewGuid();
-            product.Profile.Address = new Address(addressId);
-            product.Profile.AddressId = addressId;
+            // var addressId = Guid.NewGuid();
+            // product.Profile.Address = new Address(addressId);
+            // product.Profile.AddressId = addressId;
 
             //((Product)e.EditModel).UserProductMappings.Add(new UserProductMapping(Guid.NewGuid, ParentData.));
         }