diff --git a/scwx-qt/source/scwx/qt/settings/product_settings.cpp b/scwx-qt/source/scwx/qt/settings/product_settings.cpp
index a265b6df..b9287474 100644
--- a/scwx-qt/source/scwx/qt/settings/product_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/product_settings.cpp
@@ -42,17 +42,17 @@ ProductSettings::ProductSettings(ProductSettings&&) noexcept = default;
 ProductSettings&
 ProductSettings::operator=(ProductSettings&&) noexcept = default;
 
-SettingsVariable<bool>& ProductSettings::show_smoothed_range_folding() const
+SettingsVariable<bool>& ProductSettings::show_smoothed_range_folding()
 {
    return p->showSmoothedRangeFolding_;
 }
 
-SettingsVariable<bool>& ProductSettings::sti_forecast_enabled() const
+SettingsVariable<bool>& ProductSettings::sti_forecast_enabled()
 {
    return p->stiForecastEnabled_;
 }
 
-SettingsVariable<bool>& ProductSettings::sti_past_enabled() const
+SettingsVariable<bool>& ProductSettings::sti_past_enabled()
 {
    return p->stiPastEnabled_;
 }
diff --git a/scwx-qt/source/scwx/qt/settings/product_settings.hpp b/scwx-qt/source/scwx/qt/settings/product_settings.hpp
index 69abbddb..570c6b15 100644
--- a/scwx-qt/source/scwx/qt/settings/product_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/product_settings.hpp
@@ -25,9 +25,9 @@ public:
    ProductSettings(ProductSettings&&) noexcept;
    ProductSettings& operator=(ProductSettings&&) noexcept;
 
-   SettingsVariable<bool>& show_smoothed_range_folding() const;
-   SettingsVariable<bool>& sti_forecast_enabled() const;
-   SettingsVariable<bool>& sti_past_enabled() const;
+   SettingsVariable<bool>& show_smoothed_range_folding();
+   SettingsVariable<bool>& sti_forecast_enabled();
+   SettingsVariable<bool>& sti_past_enabled();
 
    static ProductSettings& Instance();
 
diff --git a/scwx-qt/source/scwx/qt/view/level2_product_view.cpp b/scwx-qt/source/scwx/qt/view/level2_product_view.cpp
index 559fbc6c..362c209e 100644
--- a/scwx-qt/source/scwx/qt/view/level2_product_view.cpp
+++ b/scwx-qt/source/scwx/qt/view/level2_product_view.cpp
@@ -782,7 +782,7 @@ void Level2ProductView::ComputeSweep()
             continue;
          }
 
-         std::size_t vertexCount =
+         const std::size_t vertexCount =
             (gate > 0) ? kVerticesPerGate_ : kVerticesPerOriginGate_;
 
          // Allow pointer arithmetic here, as bounds have already been checked