diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5d95c0362204d4be714c408673ecb090a1ef1c3..63f57592ebd2e4b3fa53fb87c6f2e5853a0b2239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,11 +112,11 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 
         # Qt generated files...
         -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++98-c++11-c++14-c++17-compat-pedantic -Wno-c++20-compat
-        -Wno-unsafe-buffer-usage
 
         # Different versions of MPV...
         -Wno-switch-enum
 
+        -Wno-unsafe-buffer-usage
         -Wno-source-uses-openmp
         -Wno-reserved-identifier
         -Wno-extra-semi-stmt
diff --git a/src/Lib/Audio.cc b/src/Lib/Audio.cc
index e3b6d72d96a7b56d96e664a56e76787f1f24dc7f..4cee764c63a95840adb9230b0de9b2818ea10d70 100644
--- a/src/Lib/Audio.cc
+++ b/src/Lib/Audio.cc
@@ -128,7 +128,7 @@ AudioStream::decodeData()
                 dataPtr                  = reinterpret_cast<double *>(
                     realloc(dataPtr, (dataSize + static_cast<size_t>(dataFrame->nb_samples)) *
                                                           sizeof(double)));
-                memcpy(dataPtr + dataSize, buffer, frame_count * sizeof(double));
+                memcpy(&dataPtr[dataSize], buffer, frame_count * sizeof(double));
                 dataSize += frame_count;
             }
         }
diff --git a/src/Lib/Log.cc b/src/Lib/Log.cc
index cf7a94859fdf95f62c27db9002201b1e758f0fb5..4525b63540bedcc5853191215c097e27b2edd2f8 100644
--- a/src/Lib/Log.cc
+++ b/src/Lib/Log.cc
@@ -48,8 +48,8 @@ StderrLogSinkDispatcher::trunkFileName(const char *fileName) noexcept
 
     const std::string_view fileNameView{ fileName };
     const size_type basePath = fileNameView.rfind(basePrefix);
-    return std::string_view{ fileNameView.data() + basePath + basePrefixLen,
-                             fileNameView.data() + fileNameView.size() };
+    return std::string_view{ &fileNameView[basePath + basePrefixLen],
+                             &fileNameView[fileNameView.size()] };
 }
 
 std::string
@@ -216,7 +216,7 @@ LogMessage::operator<<(const QFileInfo &fileInfo) noexcept
 }
 
 LogMessage &
-LogMessage::operator<<(const double *ptr) noexcept
+LogMessage::operator<<(const double ptr[]) noexcept
 {
     return (*this << "Pointer{ double, " << pointerToString<double>(ptr) << " }");
 }
@@ -275,9 +275,9 @@ LogMessage::operator<<(const std::string_view strv) noexcept
 }
 
 LogMessage &
-LogMessage::operator<<(const char *str) noexcept
+LogMessage::operator<<(const char str[]) noexcept
 {
-    if (str){
+    if (str) {
         const std::size_t length = strlen(str);
         for (std::size_t i = 0; (i < length) && (indexInArray < messageBufferLength - 1);
              ++i, ++indexInArray) {
diff --git a/src/Lib/Log.hh b/src/Lib/Log.hh
index fc4b9b7a29a8dd12196b157d2e3b4f622529ea76..5c6fb5bad03e431d2421cddd319d72ed51660df0 100644
--- a/src/Lib/Log.hh
+++ b/src/Lib/Log.hh
@@ -121,7 +121,7 @@ public:
 // that messages. It needs to be moved to its own thread and connected with the
 // queue version of the QObject::connect method.
 template <class Mutex, class MessageQueue>
-requires MutexType<Mutex>
+    requires MutexType<Mutex>
 class LogSinkUpdater final {
     VIVY_UNMOVABLE_OBJECT(LogSinkUpdater)
 
@@ -263,8 +263,8 @@ public:
     LogMessage &operator<<(const QString &) noexcept;
     LogMessage &operator<<(const QVariant &) noexcept;
     LogMessage &operator<<(const QFileInfo &) noexcept;
-    LogMessage &operator<<(const char *) noexcept;
-    LogMessage &operator<<(const double *) noexcept;
+    LogMessage &operator<<(const char[]) noexcept;
+    LogMessage &operator<<(const double[]) noexcept;
     LogMessage &operator<<(const char) noexcept;
     LogMessage &operator<<(const int) noexcept;
     LogMessage &operator<<(const long) noexcept;