diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp
index d5fd6d7ecb..d18ef69404 100644
--- a/src/audio_core/audio_renderer.cpp
+++ b/src/audio_core/audio_renderer.cpp
@@ -202,7 +202,7 @@ ResultVal<std::vector<u8>> AudioRenderer::UpdateAudioRenderer(const std::vector<
     }
 
     // Update behavior info output
-    std::size_t behavior_out_status_offset{
+    const std::size_t behavior_out_status_offset{
         sizeof(UpdateDataHeader) + response_data.memory_pools_size + response_data.voices_size +
         response_data.effects_size + response_data.sinks_size +
         response_data.performance_manager_size};
diff --git a/src/audio_core/behavior_info.cpp b/src/audio_core/behavior_info.cpp
index c5616d7f40..94b7a3bf1c 100644
--- a/src/audio_core/behavior_info.cpp
+++ b/src/audio_core/behavior_info.cpp
@@ -2,8 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <cstring>
+#include "audio_core/behavior_info.h"
 #include "audio_core/common.h"
-#include "behavior_info.h"
+#include "common/logging/log.h"
 
 namespace AudioCore {
 
@@ -92,7 +94,7 @@ bool BehaviorInfo::IsElapsedFrameCountSupported() const {
 }
 
 bool BehaviorInfo::IsMemoryPoolForceMappingEnabled() const {
-    return flags & 1;
+    return (flags & 1) != 0;
 }
 
 } // namespace AudioCore
diff --git a/src/audio_core/common.h b/src/audio_core/common.h
index e104fdee9c..98478b66b1 100644
--- a/src/audio_core/common.h
+++ b/src/audio_core/common.h
@@ -13,7 +13,7 @@ namespace Audren {
 constexpr ResultCode ERR_INVALID_PARAMETERS{ErrorModule::Audio, 41};
 }
 
-static constexpr u32_le CURRENT_PROCESS_REVISION = Common::MakeMagic('R', 'E', 'V', '8');
+constexpr u32_le CURRENT_PROCESS_REVISION = Common::MakeMagic('R', 'E', 'V', '8');
 
 static constexpr u32 VersionFromRevision(u32_le rev) {
     // "REV7" -> 7