diff --git a/source/backend/plugin/CarlaPluginCLAP.cpp b/source/backend/plugin/CarlaPluginCLAP.cpp
index 0c52c1f9d..d13fd61d3 100644
--- a/source/backend/plugin/CarlaPluginCLAP.cpp
+++ b/source/backend/plugin/CarlaPluginCLAP.cpp
@@ -1473,7 +1473,7 @@ public:
             fOutputAudioBuffers.extra[i].offset = aOuts;
             fOutputAudioBuffers.extra[i].isMain = portInfo.flags & CLAP_AUDIO_PORT_IS_MAIN;
             for (uint32_t j=0; j<portInfo.channel_count; ++j)
-                fOutputAudioBuffers.buffers[i].constant_mask |= (1 << j);
+                fOutputAudioBuffers.buffers[i].constant_mask |= (1ULL << j);
 
             aOuts += portInfo.channel_count;
         }
diff --git a/source/modules/water/text/CharPointer_UTF8.h b/source/modules/water/text/CharPointer_UTF8.h
index 49ff3ed47..6f9e96cc7 100644
--- a/source/modules/water/text/CharPointer_UTF8.h
+++ b/source/modules/water/text/CharPointer_UTF8.h
@@ -33,6 +33,8 @@
 
 namespace water {
 
+class String;
+
 //==============================================================================
 /**
     Wraps a pointer to a null-terminated UTF-8 character string, and provides
@@ -537,12 +539,6 @@ public:
         return true;
     }
 
-    /** Atomically swaps this pointer for a new value, returning the previous value. */
-    CharPointer_UTF8 atomicSwap (const CharPointer_UTF8 newValue)
-    {
-        return CharPointer_UTF8 (reinterpret_cast<Atomic<CharType*>&> (data).exchange (newValue.data));
-    }
-
     /** These values are the byte-order mark (BOM) values for a UTF-8 stream. */
     enum
     {
@@ -566,6 +562,8 @@ public:
 
 private:
     CharType* data;
+
+    friend class String;
 };
 
 }
diff --git a/source/modules/water/text/String.cpp b/source/modules/water/text/String.cpp
index c94ad6d05..7dd4cf11e 100644
--- a/source/modules/water/text/String.cpp
+++ b/source/modules/water/text/String.cpp
@@ -242,7 +242,8 @@ void String::clear() noexcept
 String& String::operator= (const String& other) noexcept
 {
     StringHolder::retain (other.text);
-    StringHolder::release (text.atomicSwap (other.text));
+    std::swap(text.data, const_cast<CharPointer_UTF8&>(other.text).data);
+    StringHolder::release (other.text);
     return *this;
 }