diff --git a/src/groups/mqb/mqbblp/mqbblp_domain.cpp b/src/groups/mqb/mqbblp/mqbblp_domain.cpp
index 10bcf80c7..46e2755fb 100644
--- a/src/groups/mqb/mqbblp/mqbblp_domain.cpp
+++ b/src/groups/mqb/mqbblp/mqbblp_domain.cpp
@@ -204,23 +204,24 @@ int normalizeConfig(mqbconfm::Domain* defn,
     const unsigned int minValue   = highThresh + 1;
 
     // 'maxDeliveryAttempts' can be zero, which indicates unlimited attempts.
-    if (maxDeliveryAttempts && maxDeliveryAttempts < minValue) {
-        errorDescription << domain.cluster()->name() << ", " << domain.name()
-                         << ": maxDeliveryAttempts is less than message "
-                            "throttling high threshold value. "
-                            "maxDeliveryAttempts: "
-                         << maxDeliveryAttempts
-                         << ", highThreshold: " << highThresh
-                         << ". Updated "
-                            "maxDeliveryAttempts to have a value of "
-                         << minValue
-                         << ". Please update the value of "
-                            "maxDeliveryAttempts in this domain's config to "
-                            "have a value of at least "
-                         << minValue << ".\n";
-        defn->maxDeliveryAttempts() = minValue;
-        ++updatedValues;
-    }
+    // if (maxDeliveryAttempts && maxDeliveryAttempts < minValue) {
+    //     errorDescription << domain.cluster()->name() << ", " <<
+    //     domain.name()
+    //                      << ": maxDeliveryAttempts is less than message "
+    //                         "throttling high threshold value. "
+    //                         "maxDeliveryAttempts: "
+    //                      << maxDeliveryAttempts
+    //                      << ", highThreshold: " << highThresh
+    //                      << ". Updated "
+    //                         "maxDeliveryAttempts to have a value of "
+    //                      << minValue
+    //                      << ". Please update the value of "
+    //                         "maxDeliveryAttempts in this domain's config to
+    //                         " "have a value of at least "
+    //                      << minValue << ".\n";
+    //     defn->maxDeliveryAttempts() = minValue;
+    //     ++updatedValues;
+    // }
 
     if (defn->mode().isBroadcastValue() &&
         defn->consistency().selectionId() ==
@@ -515,7 +516,7 @@ int Domain::configure(bsl::ostream&           errorDescription,
             // Invoke callbacks for each added and removed ID on each queue.
             bsl::unordered_set<bsl::string>::const_iterator it =
                 addedIds.cbegin();
-            QueueMap::const_iterator                 qIt;
+            QueueMap::const_iterator qIt;
             for (; it != addedIds.cend(); it++) {
                 for (qIt = d_queues.cbegin(); qIt != d_queues.cend(); ++qIt) {
                     d_dispatcher_p->execute(