diff --git a/core/audio/misc/audio_buffer.cpp b/core/audio/misc/audio_buffer.cpp
index 5a94ea9..a68c3c3 100644
--- a/core/audio/misc/audio_buffer.cpp
+++ b/core/audio/misc/audio_buffer.cpp
@@ -39,7 +39,7 @@ void audio_buffer::multiple(float percent) {
     }
 }
 
-std::vector<float> audio_buffer::get_interleaved_buffer() const {
+std::vector<float> audio_buffer::get_interleaved_buffer() {
     std::scoped_lock lock(lock_);
     std::vector<float> result;
     result.reserve(buffer_[0].size() * buffer_.size());
diff --git a/core/audio/misc/audio_buffer.h b/core/audio/misc/audio_buffer.h
index c66aff3..1a04010 100644
--- a/core/audio/misc/audio_buffer.h
+++ b/core/audio/misc/audio_buffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-class audio_buffer {
+class CORE_API audio_buffer {
 public:
     float** get_headers() { return headers_.data(); }
     const std::vector<float*>& get_headers_vector() { return headers_; }
@@ -14,7 +14,7 @@ public:
     void mix(audio_buffer& in_buffer, float percent = 1.f);
     void multiple(float percent);
 
-    std::vector<float> get_interleaved_buffer() const;
+    [[nodiscard]] std::vector<float> get_interleaved_buffer();
 private:
     std::vector<std::vector<float>> buffer_;
     std::vector<float*> headers_{};
diff --git a/core/audio/misc/circular_audio_buffer.h b/core/audio/misc/circular_audio_buffer.h
index f3914c3..7a8141e 100644
--- a/core/audio/misc/circular_audio_buffer.h
+++ b/core/audio/misc/circular_audio_buffer.h
@@ -218,7 +218,7 @@ public:
         SampleType* SrcBuffer = InternalBuffer.data();
         const uint32_t ReadIndex = ReadCounter;
 
-        SampleType PoppedValue = MoveTempIfPossible(InternalBuffer[ReadIndex]);
+        SampleType PoppedValue = std::move(InternalBuffer[ReadIndex]);
         ReadCounter = (ReadCounter + 1) % Capacity;
         return PoppedValue;
     }