diff --git a/CMakeVariables.txt b/CMakeVariables.txt
index 46e8b377..abfe9e15 100644
--- a/CMakeVariables.txt
+++ b/CMakeVariables.txt
@@ -7,9 +7,9 @@ LICENSE=AGPL-3.0
 # Set __dynamic to 1 to enable the -rdynamic flag for the linker, yielding some symbols in crashlogs.
 __dynamic=1
 # Set __ggdb to 1 to enable the -ggdb flag for the linker, including more debug info.
-#__ggdb=1
+# __ggdb=1
 # Set __include_backtrace__ to 1 to includes the backtrace library for better crashlogs.
-#__include_backtrace__=1
+# __include_backtrace__=1
 # Set __compile_backtrace__ to 1 to compile the backtrace library instead of using system libraries.
 # __compile_backtrace__=1
 # Set to the number of jobs (make -j equivalent) to compile the mariadbconn files with.
diff --git a/dGame/EntityManager.cpp b/dGame/EntityManager.cpp
index 49928aeb..a1bb4ca7 100644
--- a/dGame/EntityManager.cpp
+++ b/dGame/EntityManager.cpp
@@ -24,7 +24,7 @@
 #include "eGameMasterLevel.h"
 #include "eReplicaComponentType.h"
 #include "eReplicaPacketType.h"
-#include "ServerPreconditions.hpp"
+#include "ServerPreconditions.h"
 
 // Configure which zones have ghosting disabled, mostly small worlds.
 std::vector<LWOMAPID> EntityManager::m_GhostingExcludedZones = {
diff --git a/dGame/dCinema/Play.h b/dGame/dCinema/Play.h
index 95450b9d..285e2338 100644
--- a/dGame/dCinema/Play.h
+++ b/dGame/dCinema/Play.h
@@ -83,4 +83,4 @@ private:
 
 };
 
-}
\ No newline at end of file
+}
diff --git a/dGame/dCinema/Prefab.h b/dGame/dCinema/Prefab.h
index 602e1a0b..cdf49811 100644
--- a/dGame/dCinema/Prefab.h
+++ b/dGame/dCinema/Prefab.h
@@ -102,4 +102,4 @@ private:
 	std::unordered_map<size_t, Piece> m_Pieces;
 };
 
-}
\ No newline at end of file
+}
diff --git a/dGame/dCinema/Recorder.cpp b/dGame/dCinema/Recorder.cpp
index 7e82fb7d..314c4e50 100644
--- a/dGame/dCinema/Recorder.cpp
+++ b/dGame/dCinema/Recorder.cpp
@@ -7,15 +7,19 @@
 #include "ChatPackets.h"
 #include "EntityManager.h"
 #include "EntityInfo.h"
-#include "ServerPreconditions.hpp"
+#include "ServerPreconditions.h"
 #include "MovementAIComponent.h"
 #include "BaseCombatAIComponent.h"
 
 using namespace Cinema::Recording;
 
-std::unordered_map<LWOOBJID, Recorder*> m_Recorders = {};
+namespace {
 
-std::unordered_map<int32_t, std::string> m_EffectAnimations = {};
+	std::unordered_map<LWOOBJID, Recorder*> m_Recorders = {};
+
+	std::unordered_map<int32_t, std::string> m_EffectAnimations = {};
+
+}
 
 Recorder::Recorder() {
 	this->m_StartTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
@@ -23,8 +27,7 @@ Recorder::Recorder() {
 	this->m_LastRecordTime = this->m_StartTime;
 }
 
-Recorder::~Recorder() {
-}
+Recorder::~Recorder() = default;
 
 void Recorder::AddRecord(Record* record)
 {
@@ -522,8 +525,6 @@ void Cinema::Recording::Recorder::RegisterEffectForActor(LWOOBJID actorID, const
 
 			m_EffectAnimations.emplace(effectId, animationName);
 
-			result.finalize();
-
 			recorder->AddRecord(new AnimationRecord(animationName));
 		}
 	}
diff --git a/dGame/dCinema/Recorder.h b/dGame/dCinema/Recorder.h
index 7934841f..02d7e480 100644
--- a/dGame/dCinema/Recorder.h
+++ b/dGame/dCinema/Recorder.h
@@ -398,4 +398,4 @@ public:
 };
 
 
-}
\ No newline at end of file
+}
diff --git a/dGame/dCinema/Scene.cpp b/dGame/dCinema/Scene.cpp
index 51546f4c..76fa3842 100644
--- a/dGame/dCinema/Scene.cpp
+++ b/dGame/dCinema/Scene.cpp
@@ -4,7 +4,7 @@
 
 #include <tinyxml2.h>
 
-#include "ServerPreconditions.hpp"
+#include "ServerPreconditions.h"
 #include "EntityManager.h"
 #include "EntityInfo.h"
 #include "MissionComponent.h"
diff --git a/dGame/dCinema/Scene.h b/dGame/dCinema/Scene.h
index 32bb0f57..c7104fe0 100644
--- a/dGame/dCinema/Scene.h
+++ b/dGame/dCinema/Scene.h
@@ -117,4 +117,4 @@ private:
 	static std::unordered_map<std::string, Scene> m_Scenes;
 };
 
-} // namespace Cinema
\ No newline at end of file
+} // namespace Cinema
diff --git a/dGame/dUtilities/ServerPreconditions.cpp b/dGame/dUtilities/ServerPreconditions.cpp
index 16934026..33fe0fbd 100644
--- a/dGame/dUtilities/ServerPreconditions.cpp
+++ b/dGame/dUtilities/ServerPreconditions.cpp
@@ -1,14 +1,16 @@
-#include "ServerPreconditions.hpp"
+#include "ServerPreconditions.h"
 
 #include "tinyxml2.h"
 
 using namespace ServerPreconditions;
 
-std::unordered_map<LOT, std::vector<std::pair<bool, PreconditionExpression>>> ServerPreconditions::m_Preconditions;
+namespace {
+	std::unordered_map<LOT, std::vector<std::pair<bool, PreconditionExpression>>> m_Preconditions;
 
-std::unordered_map<LWOOBJID, LWOOBJID> ServerPreconditions::m_SoloActors;
+	std::unordered_map<LWOOBJID, LWOOBJID> m_SoloActors;
 
-std::unordered_map<LWOOBJID, std::unordered_set<LWOOBJID>> ServerPreconditions::m_ExcludeForPlayer;
+	std::unordered_map<LWOOBJID, std::unordered_set<LWOOBJID>> m_ExcludeForPlayer;
+}
 
 void ServerPreconditions::LoadPreconditions(std::string file) {
 	tinyxml2::XMLDocument doc;
diff --git a/dGame/dUtilities/ServerPreconditions.hpp b/dGame/dUtilities/ServerPreconditions.h
similarity index 92%
rename from dGame/dUtilities/ServerPreconditions.hpp
rename to dGame/dUtilities/ServerPreconditions.h
index bd98e38b..f3254b5a 100644
--- a/dGame/dUtilities/ServerPreconditions.hpp
+++ b/dGame/dUtilities/ServerPreconditions.h
@@ -15,12 +15,6 @@ class Entity;
 namespace ServerPreconditions
 {
 
-extern std::unordered_map<LOT, std::vector<std::pair<bool, PreconditionExpression>>> m_Preconditions;
-
-extern std::unordered_map<LWOOBJID, LWOOBJID> m_SoloActors;
-
-extern std::unordered_map<LWOOBJID, std::unordered_set<LWOOBJID>> m_ExcludeForPlayer;
-
 /**
  * @brief Loads the preconditions from the given file.
  * 
diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
index 6ce71a8c..a6d9e3f8 100644
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -87,7 +87,7 @@
 #include "CDZoneTableTable.h"
 
 #include "Recorder.h"
-#include "ServerPreconditions.hpp"
+#include "ServerPreconditions.h"
 #include "Prefab.h"
 #include "Scene.h"
 
@@ -953,7 +953,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		if (record) {
 			record->Act(actor);
 		} else {
-			Game::logger->Log("SlashCommandHandler", "Failed to get recorder for objectID: %llu", entity->GetObjectID());
+			LOG("Failed to get recorder for objectID: %llu", entity->GetObjectID());
 		}
 	}
 
@@ -981,7 +981,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 				}
 			}
 		} else {
-			Game::logger->Log("SlashCommandHandler", "Failed to get recorder for objectID: %llu", entity->GetObjectID());
+			LOG("Failed to get recorder for objectID: %llu", entity->GetObjectID());
 		}
 	}
 
@@ -995,7 +995,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		if (record) {
 			record->SaveToFile(args[0]);
 		} else {
-			Game::logger->Log("SlashCommandHandler", "Failed to get recorder for objectID: %llu", entity->GetObjectID());
+			LOG("Failed to get recorder for objectID: %llu", entity->GetObjectID());
 		}
 	}
 
@@ -1005,7 +1005,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		if (record) {
 			Cinema::Recording::Recorder::AddRecording(entity->GetObjectID(), record);
 		} else {
-			Game::logger->Log("SlashCommandHandler", "Failed to load recording from file: %s", args[0].c_str());
+			LOG("Failed to load recording from file: %s", args[0].c_str());
 		}
 	}
 
diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp
index a840e618..454d1d74 100644
--- a/dWorldServer/WorldServer.cpp
+++ b/dWorldServer/WorldServer.cpp
@@ -75,7 +75,7 @@
 #include "EntityManager.h"
 #include "CheatDetection.h"
 
-#include "ServerPreconditions.hpp"
+#include "ServerPreconditions.h"
 #include "Scene.h"
 
 namespace Game {