diff --git a/src/servers/sapphire_zone/Actor/BNpc.cpp b/src/servers/sapphire_zone/Actor/BNpc.cpp
index 40d2ced6..8e28fb4e 100644
--- a/src/servers/sapphire_zone/Actor/BNpc.cpp
+++ b/src/servers/sapphire_zone/Actor/BNpc.cpp
@@ -24,6 +24,7 @@
 #include "Math/CalcBattle.h"
 #include "Chara.h"
 #include "Player.h"
+#include "BNpc.h"
 #include "Zone/TerritoryMgr.h"
 #include "Framework.h"
 #include "Common.h"
@@ -35,9 +36,8 @@ using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 using namespace Core::Network::ActorControl;
 
-Core::Entity::BNpc::BNpc( ObjKind type ) :
-  Npc( ObjKind::BattleNpc ),
-  m_targetId( INVALID_GAME_OBJECT_ID )
+Core::Entity::BNpc::BNpc() :
+  Npc( ObjKind::BattleNpc )
 {
 
 }
diff --git a/src/servers/sapphire_zone/Actor/BNpc.h b/src/servers/sapphire_zone/Actor/BNpc.h
index 5d6af213..58028a1e 100644
--- a/src/servers/sapphire_zone/Actor/BNpc.h
+++ b/src/servers/sapphire_zone/Actor/BNpc.h
@@ -6,6 +6,7 @@
 
 #include "Forwards.h"
 #include "Chara.h"
+#include "Npc.h"
 #include <set>
 #include <map>
 #include <queue>
@@ -14,8 +15,8 @@ namespace Core {
 namespace Entity {
 
 /*!
-\class Npc
-\brief Base class for all Npcs
+\class BNpc
+\brief Base class for all BNpcs
 
 */
 class BNpc :
diff --git a/src/servers/sapphire_zone/Actor/Npc.cpp b/src/servers/sapphire_zone/Actor/Npc.cpp
index 0dfa8e36..1f96dea6 100644
--- a/src/servers/sapphire_zone/Actor/Npc.cpp
+++ b/src/servers/sapphire_zone/Actor/Npc.cpp
@@ -24,6 +24,7 @@
 #include "Math/CalcBattle.h"
 #include "Chara.h"
 #include "Player.h"
+#include "Npc.h"
 #include "Zone/TerritoryMgr.h"
 #include "Framework.h"
 #include "Common.h"
@@ -36,8 +37,7 @@ using namespace Core::Network::Packets::Server;
 using namespace Core::Network::ActorControl;
 
 Core::Entity::Npc::Npc( ObjKind type ) :
-  Chara( type ),
-  m_targetId( INVALID_GAME_OBJECT_ID )
+  Chara( type )
 {
 
 }
diff --git a/src/servers/sapphire_zone/Actor/Npc.h b/src/servers/sapphire_zone/Actor/Npc.h
index 44f251d6..66dfa1af 100644
--- a/src/servers/sapphire_zone/Actor/Npc.h
+++ b/src/servers/sapphire_zone/Actor/Npc.h
@@ -23,7 +23,7 @@ class Npc :
 {
 
 public:
-  Npc( ObjKind type );
+  Npc( Common::ObjKind type );
 
   virtual ~Npc() override;
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h
index b074e12e..d3110332 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h
@@ -15,7 +15,7 @@ class EffectPacket :
 {
 public:
   EffectPacket( uint64_t sourceId, uint32_t targetId, uint32_t actionId ) :
-    ZoneChannelPacket< FFXIVIpcEffect >( sourceId, targetId )
+    ZoneChannelPacket< FFXIVIpcEffect >( static_cast< uint32_t >( sourceId ), targetId )
   {
     m_data.header.actionId = actionId;
     m_data.header.actionAnimationId = static_cast< uint16_t >( actionId );