diff --git a/src/client/component/branding.cpp b/src/client/component/branding.cpp
index 7d168135..fd7e84e8 100644
--- a/src/client/component/branding.cpp
+++ b/src/client/component/branding.cpp
@@ -63,4 +63,4 @@ namespace branding
 	};
 }
 
-//REGISTER_COMPONENT(branding::component)
\ No newline at end of file
+REGISTER_COMPONENT(branding::component)
\ No newline at end of file
diff --git a/src/client/component/scheduler.cpp b/src/client/component/scheduler.cpp
index f24ac54e..1c8b7287 100644
--- a/src/client/component/scheduler.cpp
+++ b/src/client/component/scheduler.cpp
@@ -221,4 +221,4 @@ namespace scheduler
 	};
 }
 
-//REGISTER_COMPONENT(scheduler::component)
\ No newline at end of file
+REGISTER_COMPONENT(scheduler::component)
\ No newline at end of file
diff --git a/src/client/game/game.hpp b/src/client/game/game.hpp
index 1d6ab0c8..d1e623af 100644
--- a/src/client/game/game.hpp
+++ b/src/client/game/game.hpp
@@ -40,10 +40,10 @@ namespace game
 		{
 			if (environment::is_sp())
 			{
-				return sp_object_;
+				return reinterpret_cast<T*>((uint64_t)sp_object_ + base_address);
 			}
 
-			return mp_object_;
+			return reinterpret_cast<T*>((uint64_t)mp_object_ + base_address);
 		}
 
 		operator T* () const