diff --git a/scwx-qt/source/scwx/qt/settings/settings_interface.cpp b/scwx-qt/source/scwx/qt/settings/settings_interface.cpp
index b2089d08..3fbeccf3 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_interface.cpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_interface.cpp
@@ -539,7 +539,8 @@ void SettingsInterface<T>::EnableTrimming(bool trimmingEnabled)
 }
 
 template<class T>
-void SettingsInterface<T>::SetInvalidTooltip(std::optional<std::string> tooltip)
+void SettingsInterface<T>::SetInvalidTooltip(
+   const std::optional<std::string>& tooltip)
 {
    p->invalidTooltip_ = std::move(tooltip);
 }
diff --git a/scwx-qt/source/scwx/qt/settings/settings_interface.hpp b/scwx-qt/source/scwx/qt/settings/settings_interface.hpp
index 0e42aca7..6bf586a7 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_interface.hpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_interface.hpp
@@ -136,7 +136,7 @@ public:
     *
     * @param tooltip the tooltip to be displayed
     */
-   void SetInvalidTooltip(std::optional<std::string> tooltip);
+   void SetInvalidTooltip(const std::optional<std::string>& tooltip);
 
 private:
    class Impl;
diff --git a/scwx-qt/source/scwx/qt/ui/custom_layer_dialog.cpp b/scwx-qt/source/scwx/qt/ui/custom_layer_dialog.cpp
index b297ab22..d7c963f6 100644
--- a/scwx-qt/source/scwx/qt/ui/custom_layer_dialog.cpp
+++ b/scwx-qt/source/scwx/qt/ui/custom_layer_dialog.cpp
@@ -49,7 +49,7 @@ void CustomLayerDialogImpl::handle_mapChanged(QMapLibre::Map::MapChange change)
       self_->ui->layerListWidget->clear();
       self_->ui->layerListWidget->addItems(layerIds);
 
-      std::string symbologyLayer = util::maplibre::FindMapSymbologyLayer(
+      const std::string symbologyLayer = util::maplibre::FindMapSymbologyLayer(
          layerIds, {customStyleDrawLayer});
 
       const auto& symbologyItems = self_->ui->layerListWidget->findItems(
diff --git a/scwx-qt/source/scwx/qt/util/maplibre.cpp b/scwx-qt/source/scwx/qt/util/maplibre.cpp
index 88ae4cce..6a4c7d55 100644
--- a/scwx-qt/source/scwx/qt/util/maplibre.cpp
+++ b/scwx-qt/source/scwx/qt/util/maplibre.cpp
@@ -137,7 +137,7 @@ std::string FindMapSymbologyLayer(const QStringList&              styleLayers,
                               [&layer](const std::string& styleLayer) -> bool
                               {
                                  // Perform case-insensitive matching
-                                 RE2 re {"(?i)" + styleLayer};
+                                 const RE2 re {"(?i)" + styleLayer};
                                  if (re.ok())
                                  {
                                     return RE2::FullMatch(layer, re);