diff --git a/src/servers/Server_Common/Common.h b/src/servers/Server_Common/Common.h
index 32b18315..0aac4f00 100644
--- a/src/servers/Server_Common/Common.h
+++ b/src/servers/Server_Common/Common.h
@@ -2,7 +2,7 @@
 #define _COMMON_H
 
 #include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <boost/make_shared.hpp>
diff --git a/src/servers/Server_REST/main.cpp b/src/servers/Server_REST/main.cpp
index 04fb7b48..525a7264 100644
--- a/src/servers/Server_REST/main.cpp
+++ b/src/servers/Server_REST/main.cpp
@@ -91,6 +91,7 @@ int main()
 
    g_log.info( "Database: Connected to " + params.hostname + ":" + std::to_string( params.port ) );
    g_exdData.loadZoneInfo();
+   g_exdData.loadClassJobInfo();
 
    HttpServer server;
    server.config.port = stoi( m_pConfig->getValue< std::string >( "Settings.General.HttpPort", "80" ) );
diff --git a/src/servers/Server_Zone/PlayerSpawnPacket.h b/src/servers/Server_Zone/PlayerSpawnPacket.h
index 0353502e..71dda09a 100644
--- a/src/servers/Server_Zone/PlayerSpawnPacket.h
+++ b/src/servers/Server_Zone/PlayerSpawnPacket.h
@@ -6,6 +6,8 @@
 #include <Server_Common/UtilMath.h>
 #include "Player.h"
 #include "Forwards.h"
+#include "Inventory.h"
+#include "Item.h"
 
 namespace Core {
    namespace Network {
@@ -45,7 +47,9 @@ namespace Core {
                   //m_data.tPMax = 3000;
                   m_data.level = pPlayer->getLevel();
                   memcpy( m_data.look, pPlayer->getLookArray(), 26 );
-                  m_data.mainWeaponModel = pPlayer->getModelMainWeapon();
+                  auto item = pPlayer->getInvetory()->getItemAt( Inventory::GearSet0, 0 );
+                  if( item )
+                     m_data.mainWeaponModel = item->getModelId1();
                   m_data.secWeaponModel = pPlayer->getModelSubWeapon();
                   m_data.models[0] = pPlayer->getModelForSlot( Inventory::EquipSlot::Head );
                   m_data.models[1] = pPlayer->getModelForSlot( Inventory::EquipSlot::Body );
diff --git a/src/servers/Server_Zone/PlayerSql.cpp b/src/servers/Server_Zone/PlayerSql.cpp
index 83ab972b..4090ae40 100644
--- a/src/servers/Server_Zone/PlayerSql.cpp
+++ b/src/servers/Server_Zone/PlayerSql.cpp
@@ -129,6 +129,8 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
 
    field[11].getBinary( reinterpret_cast< char* >( m_customize ), 26 );
 
+   m_modelMainWeapon = field[12].getUInt64();
+
    field[14].getBinary( reinterpret_cast< char* >( m_modelEquip ), 40 );
 
    m_guardianDeity = field[15].getUInt8();