diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/Server_REST/PlayerMinimal.cpp
index 29269c43..5ca8410a 100644
--- a/src/servers/Server_REST/PlayerMinimal.cpp
+++ b/src/servers/Server_REST/PlayerMinimal.cpp
@@ -174,7 +174,7 @@ namespace Core {
       float x, y, z, o;
       int32_t startTown = 0;
 
-      switch( m_class )
+      switch( static_cast< Core::Common::ClassJob >( m_class ) )
       {
       case Core::Common::ClassJob::Conjurer:
       case Core::Common::ClassJob::Lancer:
diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
index c473aa54..43c2ab19 100644
--- a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
@@ -48,7 +48,7 @@ Core::StatusEffect::StatusEffectContainer::~StatusEffectContainer()
 
 void Core::StatusEffect::StatusEffectContainer::addStatusEffect( StatusEffectPtr pEffect )
 {
-   uint8_t nextSlot = getFreeSlot();
+   int8_t nextSlot = getFreeSlot();
    // if there is no slot left, do not add the effect
    if( nextSlot == -1 )
       return;