diff --git a/src/lib/platform/WlClipboard.cpp b/src/lib/platform/WlClipboard.cpp
index c63fea395..5f9cea9a7 100644
--- a/src/lib/platform/WlClipboard.cpp
+++ b/src/lib/platform/WlClipboard.cpp
@@ -258,7 +258,7 @@ bool WlClipboard::empty()
 
   if (success) {
     // Update ownership and cache only if command succeeded
-    std::lock_guard<std::mutex> lock(m_cacheMutex);
+    std::scoped_lock<std::mutex> lock(m_cacheMutex);
     updateOwnership(true);
     invalidateCache();
   }
@@ -291,7 +291,7 @@ void WlClipboard::add(Format format, const std::string &data)
 
   bool success = executeCommandWithInput(args, data);
   if (success) {
-    std::lock_guard<std::mutex> lock(m_cacheMutex);
+    std::scoped_lock<std::mutex> lock(m_cacheMutex);
     updateOwnership(true);
     invalidateCache();
   } else {
@@ -335,7 +335,7 @@ bool WlClipboard::has(Format format) const
     return false;
   }
 
-  std::lock_guard<std::mutex> lock(m_cacheMutex);
+  std::scoped_lock<std::mutex> lock(m_cacheMutex);
 
   // Check cache validity
   Time currentTime = getCurrentTime();
@@ -383,7 +383,7 @@ std::string WlClipboard::get(Format format) const
     return std::string();
   }
 
-  std::lock_guard<std::mutex> lock(m_cacheMutex);
+  std::scoped_lock<std::mutex> lock(m_cacheMutex);
 
   // Return cached data if available and valid
   if (m_cached && m_cachedAvailable[static_cast<int>(format)] && !m_cachedData[static_cast<int>(format)].empty()) {
@@ -713,7 +713,7 @@ void WlClipboard::monitorClipboard()
         lastTypes = currentTypes;
 
         // Clear cache when clipboard changes
-        std::lock_guard<std::mutex> lock(m_cacheMutex);
+        std::scoped_lock<std::mutex> lock(m_cacheMutex);
         invalidateCache();
         const_cast<WlClipboard *>(this)->updateOwnership(false);
       }
@@ -750,7 +750,7 @@ void WlClipboard::resetChanged()
   m_hasChanged = false;
 
   // Clear cache when resetting change flag to force fresh data retrieval
-  std::lock_guard<std::mutex> lock(m_cacheMutex);
+  std::scoped_lock<std::mutex> lock(m_cacheMutex);
   invalidateCache();
 }
 
diff --git a/src/lib/platform/WlClipboardCollection.cpp b/src/lib/platform/WlClipboardCollection.cpp
index 9315ac0bf..d910cb927 100644
--- a/src/lib/platform/WlClipboardCollection.cpp
+++ b/src/lib/platform/WlClipboardCollection.cpp
@@ -56,7 +56,7 @@ void WlClipboardCollection::startMonitoring()
     return;
   }
 
-  for (auto &clipboard : m_clipboards) {
+  for (const auto &clipboard : m_clipboards) {
     if (clipboard) {
       clipboard->startMonitoring();
     }
@@ -71,7 +71,7 @@ void WlClipboardCollection::stopMonitoring()
     return;
   }
 
-  for (auto &clipboard : m_clipboards) {
+  for (const auto &clipboard : m_clipboards) {
     if (clipboard) {
       clipboard->stopMonitoring();
     }
@@ -80,13 +80,13 @@ void WlClipboardCollection::stopMonitoring()
   m_monitoring = false;
 }
 
-void WlClipboardCollection::resetChanged()
+void WlClipboardCollection::resetChanged() const
 {
   if (!m_available) {
     return;
   }
 
-  for (auto &clipboard : m_clipboards) {
+  for (const auto &clipboard : m_clipboards) {
     if (clipboard) {
       clipboard->resetChanged();
     }
diff --git a/src/lib/platform/WlClipboardCollection.h b/src/lib/platform/WlClipboardCollection.h
index 52c3a06b3..4fc3e6520 100644
--- a/src/lib/platform/WlClipboardCollection.h
+++ b/src/lib/platform/WlClipboardCollection.h
@@ -43,7 +43,7 @@ public:
   void stopMonitoring();
 
   //! Reset change detection
-  void resetChanged();
+  void resetChanged() const;
 
 private:
   //! Initialize clipboard backends