diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 65cf285e..0838cd21 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -127,14 +127,14 @@ void Sapphire::Action::Action::onStart()
   {
     m_pSource->getAsPlayer()->sendDebug( "onStart()" );
 
-    auto castPacket = makeZonePacket< FFXIVIpcActorCast >( getId() );
+    auto castPacket = makeZonePacket< Server::FFXIVIpcActorCast >( getId() );
 
     castPacket->data().action_id = m_id;
     castPacket->data().skillType = Common::SkillType::Normal;
     castPacket->data().unknown_1 = m_id;
     // This is used for the cast bar above the target bar of the caster.
     castPacket->data().cast_time = m_castTime / 1000.f;
-    castPacket->data().target_id = m_pTarget->getId();
+    castPacket->data().target_id = m_targetId;
 
     m_pSource->sendToInRangeSet( castPacket, true );
     m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::Casting );
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 45723cc9..75c6dec0 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -27,7 +27,7 @@ void World::Manager::ActionMgr::handleTargetedPlayerAction( Entity::Player& play
 {
   player.sendDebug( "got act: {0}", actionData->name );
 
-  auto action = Action::make_Action( player.getAsPlayer(), nullptr, actionId, actionData, framework() );
+  auto action = Action::make_Action( player.getAsPlayer(), actionId, actionData, framework() );
   action->setType( static_cast< Common::ActionType >( type ) );
 
   bootstrapAction( player, action, *actionData );