diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 1e72fcb3..ad12df0c 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -192,9 +192,10 @@ Core::Common::OnlineStatus Core::Entity::Player::getOnlineStatus()
          // todo: also check that the status can actually be set here, otherwise we need to ignore it (and ban the player obv)
          statusDisplayOrder = pOnlineStatus->priority;
          applicableStatus = i;
-         return static_cast< OnlineStatus >( applicableStatus );
       }
    }
+
+   return static_cast< OnlineStatus >( applicableStatus );
 }
 
 void Core::Entity::Player::setOnlineStatusMask( uint64_t status )
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.h b/src/servers/sapphire_zone/Script/ScriptLoader.h
index edf68d32..739b9078 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.h
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.h
@@ -12,10 +12,10 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <winbase.h>
-typedef HMODULE ModuleHandle;
+using ModuleHandle = HMODULE;
 #else
 #include <dlfcn.h>
-typedef void* ModuleHandle;
+using ModuleHandle = void*;
 #endif
 
 namespace Core {