diff --git a/src/groups/mqb/mqba/mqba_domainresolver.cpp b/src/groups/mqb/mqba/mqba_domainresolver.cpp
index 480374865..f06bfa6b8 100644
--- a/src/groups/mqb/mqba/mqba_domainresolver.cpp
+++ b/src/groups/mqb/mqba/mqba_domainresolver.cpp
@@ -152,8 +152,6 @@ int DomainResolver::getOrRead(bsl::ostream&             errorDescription,
         bsl::string filePath = mqbcfg::BrokerConfig::get().etcDir() +
                                "/domains/" + resolvedDomainName + ".json";
 
-        bdlma::LocalSequentialAllocator<1024> localAllocator(d_allocator_p);
-
         // This is copy-pasted from mqba_configprovider.cpp. Maybe we are
         // going to merge the two? If not, consider factoring this bit.
         if (!bdls::FilesystemUtil::exists(filePath)) {
diff --git a/src/groups/mqb/mqbblp/mqbblp_clusterproxy.h b/src/groups/mqb/mqbblp/mqbblp_clusterproxy.h
index 89cf41f20..978f9c3e2 100644
--- a/src/groups/mqb/mqbblp/mqbblp_clusterproxy.h
+++ b/src/groups/mqb/mqbblp/mqbblp_clusterproxy.h
@@ -717,22 +717,20 @@ inline size_t ClusterProxy::ChannelBuffer::bytes() const
 // class ClusterProxy
 // ------------------
 
-inline void
-ClusterProxy::getPrimaryNodes(int*          rc,
-                              bsl::ostream& errorDescription,
-                              bsl::vector<mqbnet::ClusterNode*>* nodes,
-                              bool* isSelfPrimary) const
+inline void ClusterProxy::getPrimaryNodes(int*,
+                                          bsl::ostream&,
+                                          bsl::vector<mqbnet::ClusterNode*>*,
+                                          bool*) const
 {
     // no implementation -- this should not run.
     BSLS_ASSERT_SAFE(false);
 }
 
-inline void
-ClusterProxy::getPartitionPrimaryNode(int*                  rc,
-                                      bsl::ostream&         errorDescription,
-                                      mqbnet::ClusterNode** node,
-                                      bool*                 isSelfPrimary,
-                                      int                   partitionId) const
+inline void ClusterProxy::getPartitionPrimaryNode(int*,
+                                                  bsl::ostream&,
+                                                  mqbnet::ClusterNode**,
+                                                  bool*,
+                                                  int) const
 {
     // no implementation -- this should not run.
     BSLS_ASSERT_SAFE(false);
diff --git a/src/groups/mqb/mqbblp/mqbblp_relayqueueengine.cpp b/src/groups/mqb/mqbblp/mqbblp_relayqueueengine.cpp
index 8f3dd58d1..7f09e90f0 100644
--- a/src/groups/mqb/mqbblp/mqbblp_relayqueueengine.cpp
+++ b/src/groups/mqb/mqbblp/mqbblp_relayqueueengine.cpp
@@ -1795,9 +1795,9 @@ RelayQueueEngine::push(mqbi::StorageMessageAttributes*           attributes,
         PushStream::Apps::iterator itApp = d_pushStream.d_apps.find(
             subQueueId);
         if (itApp == d_pushStream.d_apps.end()) {
-            AppsMap::const_iterator cit = d_apps.find(subQueueId);
+            AppsMap::const_iterator app_cit = d_apps.find(subQueueId);
 
-            if (cit == d_apps.end()) {
+            if (app_cit == d_apps.end()) {
                 BMQ_LOGTHROTTLE_ERROR()
                     << "#QUEUE_UNKNOWN_SUBSCRIPTION_ID "
                     << "Remote queue: " << d_queueState_p->uri()
@@ -1807,7 +1807,8 @@ RelayQueueEngine::push(mqbi::StorageMessageAttributes*           attributes,
                 continue;  // CONTINUE
             }
 
-            itApp = d_pushStream.d_apps.emplace(subQueueId, cit->second).first;
+            itApp =
+                d_pushStream.d_apps.emplace(subQueueId, app_cit->second).first;
         }
         else if (!checkForDuplicate(itApp->second.d_app.get(), msgGUID)) {
             continue;  // CONTINUE
diff --git a/src/groups/mqb/mqbmock/mqbmock_cluster.h b/src/groups/mqb/mqbmock/mqbmock_cluster.h
index 3fc582c50..4f4cb4604 100644
--- a/src/groups/mqb/mqbmock/mqbmock_cluster.h
+++ b/src/groups/mqb/mqbmock/mqbmock_cluster.h
@@ -611,20 +611,20 @@ inline void Cluster::advanceTime(const bsls::TimeInterval& interval)
     d_timeSource.advanceTime(interval);
 }
 
-inline void Cluster::getPrimaryNodes(int*          rc,
-                                     bsl::ostream& errorDescription,
-                                     bsl::vector<mqbnet::ClusterNode*>* nodes,
-                                     bool* isSelfPrimary) const
+inline void Cluster::getPrimaryNodes(int*,
+                                     bsl::ostream&,
+                                     bsl::vector<mqbnet::ClusterNode*>*,
+                                     bool*) const
 {
     // no implementation -- this should never run.
     BSLS_ASSERT_SAFE(false);
 }
 
-inline void Cluster::getPartitionPrimaryNode(int*          rc,
-                                             bsl::ostream& errorDescription,
-                                             mqbnet::ClusterNode** node,
-                                             bool* isSelfPrimary,
-                                             int   partitionId) const
+inline void Cluster::getPartitionPrimaryNode(int*,
+                                             bsl::ostream&,
+                                             mqbnet::ClusterNode**,
+                                             bool*,
+                                             int) const
 {
     // no implementation -- this should never run.
     BSLS_ASSERT_SAFE(false);
diff --git a/src/groups/mqb/mqbs/mqbs_filebackedstorage.cpp b/src/groups/mqb/mqbs/mqbs_filebackedstorage.cpp
index 8cb19dbd9..218aa73f4 100644
--- a/src/groups/mqb/mqbs/mqbs_filebackedstorage.cpp
+++ b/src/groups/mqb/mqbs/mqbs_filebackedstorage.cpp
@@ -736,14 +736,14 @@ void FileBackedStorage::processMessageRecord(
                                                 &dataStreamMessage);
 
                     // Move auto confirms to the data record
-                    for (AutoConfirms::const_iterator it =
+                    for (AutoConfirms::const_iterator cit =
                              d_autoConfirms.begin();
-                         it != d_autoConfirms.end();
-                         ++it) {
+                         cit != d_autoConfirms.end();
+                         ++cit) {
                         irc.first->second.d_array.push_back(
-                            it->d_confirmRecordHandle);
+                            cit->d_confirmRecordHandle);
                         d_virtualStorageCatalog.autoConfirm(dataStreamMessage,
-                                                            it->d_appKey);
+                                                            cit->d_appKey);
                     }
                 }
                 else {
diff --git a/src/groups/mqb/mqbs/mqbs_filestoreprotocol.cpp b/src/groups/mqb/mqbs/mqbs_filestoreprotocol.cpp
index 7ecfce125..8c6afd84f 100644
--- a/src/groups/mqb/mqbs/mqbs_filestoreprotocol.cpp
+++ b/src/groups/mqb/mqbs/mqbs_filestoreprotocol.cpp
@@ -464,6 +464,7 @@ const char* ConfirmReason::toAscii(ConfirmReason::Enum value)
     switch (value) {
         CASE(CONFIRMED)
         CASE(REJECTED)
+        CASE(AUTO_CONFIRMED)
     default: return "(* UNKNOWN *)";
     }