diff --git a/src/debug_utils-inl.h b/src/debug_utils-inl.h
index 86dc29d6bbe9fb..3736663d9977c0 100644
--- a/src/debug_utils-inl.h
+++ b/src/debug_utils-inl.h
@@ -50,7 +50,7 @@ struct ToStringHelper {
   template <unsigned BASE_BITS,
             typename T,
             typename = std::enable_if_t<!std::is_integral_v<T>>>
-  static std::string BaseConvert(T value) {
+  static std::string BaseConvert(T& value) {  // NOLINT(runtime/references)
     return Convert(std::forward<T>(value));
   }
 };
diff --git a/src/util.h b/src/util.h
index eb6da3487737d6..84583d80c598ba 100644
--- a/src/util.h
+++ b/src/util.h
@@ -388,6 +388,11 @@ constexpr size_t strsize(const T (&)[N]) {
 template <typename T, size_t kStackStorageSize = 1024>
 class MaybeStackBuffer {
  public:
+  // Disallow copy constructor
+  MaybeStackBuffer(const MaybeStackBuffer&) = delete;
+  // Disallow copy assignment operator
+  MaybeStackBuffer& operator=(const MaybeStackBuffer& other) = delete;
+
   const T* out() const {
     return buf_;
   }