diff --git a/CInterface/Battling/BattleRandom.cpp b/CInterface/Battling/BattleRandom.cpp
index 2328ad6..6dc25ee 100644
--- a/CInterface/Battling/BattleRandom.cpp
+++ b/CInterface/Battling/BattleRandom.cpp
@@ -7,14 +7,12 @@ export BattleRandom* CreatureLib_BattleRandom_ConstructWithSeed(uint_fast32_t se
 
 export void CreatureLib_BattleRandom_Destruct(BattleRandom* p) { delete p; }
 
-export uint8_t CreatureLib_BattleRandom_EffectChance(bool& out, BattleRandom* p, float chance, ExecutingAttack* attack,
-                                                     Creature* target) {
+export i8 CreatureLib_BattleRandom_EffectChance(bool& out, BattleRandom* p, float chance, ExecutingAttack* attack,
+                                                Creature* target) {
     Try(out = p->EffectChance(chance, attack, target);)
 }
 
-export int32_t CreatureLib_BattleRandom_Get(BattleRandom* p) { return p->Get(); }
-export int32_t CreatureLib_BattleRandom_GetMax(BattleRandom* p, int32_t max) { return p->Get(max); }
-export int32_t CreatureLib_BattleRandom_GetMinMax(BattleRandom* p, int32_t min, int32_t max) {
-    return p->Get(min, max);
-}
+export i32 CreatureLib_BattleRandom_Get(BattleRandom* p) { return p->Get(); }
+export i32 CreatureLib_BattleRandom_GetMax(BattleRandom* p, i32 max) { return p->Get(max); }
+export i32 CreatureLib_BattleRandom_GetMinMax(BattleRandom* p, i32 min, i32 max) { return p->Get(min, max); }
 export uint_fast32_t CreatureLib_BattleRandom_GetSeed(BattleRandom* p) { return p->GetSeed(); }
diff --git a/CInterface/Battling/BattleStatCalculator.cpp b/CInterface/Battling/BattleStatCalculator.cpp
index 4e6724d..9753773 100644
--- a/CInterface/Battling/BattleStatCalculator.cpp
+++ b/CInterface/Battling/BattleStatCalculator.cpp
@@ -6,13 +6,12 @@ export const BattleStatCalculator* CreatureLib_BattleStatCalculator_Construct()
 
 export void CreatureLib_BattleStatCalculator_Destruct(const BattleStatCalculator* p) { delete p; }
 
-export uint8_t CreatureLib_BattleStatCalculator_CalculateFlatStat(uint32_t& out, const BattleStatCalculator* p,
-                                                                  Creature* creature,
-                                                                  CreatureLib::Library::Statistic stat) {
+export u8 CreatureLib_BattleStatCalculator_CalculateFlatStat(u32& out, const BattleStatCalculator* p,
+                                                             Creature* creature, CreatureLib::Library::Statistic stat) {
     Try(out = p->CalculateFlatStat(creature, stat);)
 }
-export uint8_t CreatureLib_BattleStatCalculator_CalculateBoostedStat(uint32_t& out, const BattleStatCalculator* p,
-                                                                     Creature* creature,
-                                                                     CreatureLib::Library::Statistic stat) {
+export u8 CreatureLib_BattleStatCalculator_CalculateBoostedStat(u32& out, const BattleStatCalculator* p,
+                                                                Creature* creature,
+                                                                CreatureLib::Library::Statistic stat) {
     Try(out = p->CalculateBoostedStat(creature, stat);)
 }
\ No newline at end of file
diff --git a/CInterface/Battling/ExperienceLibrary.cpp b/CInterface/Battling/ExperienceLibrary.cpp
index b98ae9f..7ecdc72 100644
--- a/CInterface/Battling/ExperienceLibrary.cpp
+++ b/CInterface/Battling/ExperienceLibrary.cpp
@@ -6,8 +6,8 @@ export const ExperienceLibrary* CreatureLib_ExperienceLibrary_Construct() { retu
 
 export void CreatureLib_ExperienceLibrary_Destruct(const ExperienceLibrary* p) { delete p; }
 
-export uint8_t CreatureLib_ExperienceLibrary_HandleExperienceGain(const ExperienceLibrary* p, Creature* faintedMon,
-                                                                  Creature* opponents[], size_t opponentsCount) {
+export u8 CreatureLib_ExperienceLibrary_HandleExperienceGain(const ExperienceLibrary* p, Creature* faintedMon,
+                                                             Creature* opponents[], size_t opponentsCount) {
     Try(auto set = std::unordered_set<ArbUt::BorrowedPtr<Creature>>(opponentsCount);
         for (size_t i = 0; i < opponentsCount;
              i++) { set.insert(opponents[i]); } p->HandleExperienceGain(faintedMon, set);)
diff --git a/CInterface/Core.hpp b/CInterface/Core.hpp
index db2be55..7f90ccb 100644
--- a/CInterface/Core.hpp
+++ b/CInterface/Core.hpp
@@ -6,6 +6,7 @@
 #include <exception>
 #include <sstream>
 #include <string>
+#include "../src/Defines.hpp"
 #define export extern "C" [[maybe_unused]]
 
 #define CreatureLibException 2;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a7ec9c..dbef6cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,8 @@ endif (SHARED)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     add_link_options(-fuse-ld=lld)
+    # Only warn for unknown sanitizers. This error is not major enough to error on.
+    add_compile_options(-Wno-error=unknown-sanitizers)
 endif ()
 
 if (LEVEL_SIZE STREQUAL "8")