diff --git a/src/scripts/quest/classquest/ARC/ClsArc001.cpp b/src/scripts/quest/classquest/ARC/ClsArc001.cpp
index d71d3e30..11649044 100644
--- a/src/scripts/quest/classquest/ARC/ClsArc001.cpp
+++ b/src/scripts/quest/classquest/ARC/ClsArc001.cpp
@@ -558,7 +558,6 @@ private:
 
     if( result.getResult( 0 ) == 1 )
     {
-      //if( player.giveQuestRewards( getId(), result.getResult(1)) )
       player.finishQuest( getId(), result.getResult( 1 ) );
     }
   }
diff --git a/src/scripts/quest/classquest/ARC/ClsArc002.cpp b/src/scripts/quest/classquest/ARC/ClsArc002.cpp
index 6b0361c3..8fc83fd7 100644
--- a/src/scripts/quest/classquest/ARC/ClsArc002.cpp
+++ b/src/scripts/quest/classquest/ARC/ClsArc002.cpp
@@ -619,7 +619,6 @@ private:
   {
     if( result.getResult( 0 ) == 1 )
     {
-      //if (player.giveQuestRewards(getId(), result.getResult(1)))
       player.finishQuest( getId(), result.getResult( 1 ) );
     }
   }
diff --git a/src/scripts/quest/classquest/ARC/ClsArc003.cpp b/src/scripts/quest/classquest/ARC/ClsArc003.cpp
index 3b6152fa..636650c6 100644
--- a/src/scripts/quest/classquest/ARC/ClsArc003.cpp
+++ b/src/scripts/quest/classquest/ARC/ClsArc003.cpp
@@ -549,7 +549,9 @@ private:
   {
     if( result.getResult( 0 ) == 1 )
     {
-      //Broken QuestBattle
+      //TODO: QuestBattle
+      playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
+      eventMgr().sendEventNotice( player, getId(), 3, 0 );
       quest.setSeq( Seq5 );
 
       /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
diff --git a/src/scripts/quest/classquest/ARC/ClsArc004.cpp b/src/scripts/quest/classquest/ARC/ClsArc004.cpp
index 86e7ed5c..d331997c 100644
--- a/src/scripts/quest/classquest/ARC/ClsArc004.cpp
+++ b/src/scripts/quest/classquest/ARC/ClsArc004.cpp
@@ -7,8 +7,6 @@
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 #include <Service.h>
-//Temporrary because QuestBattles are broken
-#include "Manager/PlayerMgr.h"
 
 // Quest Script: ClsArc004_00070
 // Quest Name: To Catch a Poacher
@@ -399,7 +397,8 @@ private:
     if( result.getResult( 0 ) == 1 )
     {
       //QuestBattle weirdness, Plus not being able to talk to that NPC, so we have to skip Seq5 entirely
-      Sapphire::World::Manager::PlayerMgr::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
+      playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
+      eventMgr().sendEventNotice( player, getId(), 3, 0 );
       quest.setSeq( SeqFinish );
 
       /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
diff --git a/src/scripts/quest/classquest/ARC/ClsArc005.cpp b/src/scripts/quest/classquest/ARC/ClsArc005.cpp
index 8f0f3752..064fc35e 100644
--- a/src/scripts/quest/classquest/ARC/ClsArc005.cpp
+++ b/src/scripts/quest/classquest/ARC/ClsArc005.cpp
@@ -7,8 +7,6 @@
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 #include <Service.h>
-//Temporrary because QuestBattles are broken
-#include "Manager/PlayerMgr.h"
 
 // Quest Script: ClsArc005_00071
 // Quest Name: Homecoming
@@ -203,6 +201,7 @@ private:
 
   void Scene00005Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
   {
+    eventMgr().sendEventNotice( player, getId(), 2, 0 );
     quest.setSeq( Seq4 );
   }
 
@@ -229,9 +228,10 @@ private:
   {
     if( result.getResult( 0 ) == 1 )
     {
-      //Questbattles be broken
+      //TODO: Questbattles be broken
+      playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
+      eventMgr().sendEventNotice( player, getId(), 3, 0 );
       quest.setSeq( SeqFinish );
-      Sapphire::World::Manager::PlayerMgr::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
       /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
 
       eventMgr().eventFinish( player, result.eventId, 0 );
diff --git a/src/scripts/quest/classquest/ARC/ClsArc006.cpp b/src/scripts/quest/classquest/ARC/ClsArc006.cpp
index ae315a07..0780f0c4 100644
--- a/src/scripts/quest/classquest/ARC/ClsArc006.cpp
+++ b/src/scripts/quest/classquest/ARC/ClsArc006.cpp
@@ -7,8 +7,6 @@
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 #include <Service.h>
-//Temporrary because QuestBattles are broken
-#include "Manager/PlayerMgr.h"
 
 // Quest Script: ClsArc006_00076
 // Quest Name: The One that Got Away
@@ -189,9 +187,10 @@ private:
   {
     if( result.getResult( 0 ) == 1 )
     {
-      //QuestBattles don't work atm
+      //TODO: QuestBattles don't work atm
+      playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
+      eventMgr().sendEventNotice( player, getId(), 2, 0 );
       quest.setSeq( Seq2 );
-      Sapphire::World::Manager::PlayerMgr::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
       /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
 
       eventMgr().eventFinish(player, result.eventId, 0);
@@ -298,9 +297,10 @@ private:
   {
     if( result.getResult( 0 ) == 1 )
     {
-      //QuestBattles don't work atm
+      //TODO: QuestBattles don't work atm
+      playerMgr().sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
+      eventMgr().sendEventNotice( player, getId(), 3, 0 );
       quest.setSeq( SeqFinish );
-      Sapphire::World::Manager::PlayerMgr::sendUrgent( player, "QuestBattle content is currently broken. The fight has been skipped for you." );
       /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
 
       eventMgr().eventFinish(player, result.eventId, 0);
diff --git a/src/scripts/quest/classquest/ARC/ClsArc100.cpp b/src/scripts/quest/classquest/ARC/ClsArc100.cpp
index 3777df19..4437e9e4 100644
--- a/src/scripts/quest/classquest/ARC/ClsArc100.cpp
+++ b/src/scripts/quest/classquest/ARC/ClsArc100.cpp
@@ -141,6 +141,7 @@ private:
       quest.setUI8AL( 0 );
       quest.setUI8BH( 0 );
       quest.setUI8BL( 0 );
+      eventMgr().sendEventNotice( player, getId(), 3, 0 );
       quest.setSeq( SeqFinish );
     }
   }
diff --git a/src/scripts/quest/classquest/ARC/ClsArc997.cpp b/src/scripts/quest/classquest/ARC/ClsArc997.cpp
index 74af9486..818b88cc 100644
--- a/src/scripts/quest/classquest/ARC/ClsArc997.cpp
+++ b/src/scripts/quest/classquest/ARC/ClsArc997.cpp
@@ -239,6 +239,7 @@ private:
 
   void Scene00001Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
   {
+    eventMgr().sendEventNotice( player, getId(), 1, 0 );
     quest.setSeq( Seq2 );
   }
 
@@ -531,6 +532,7 @@ private:
 
   void Scene00026Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
   {
+    eventMgr().sendEventNotice( player, getId(), 2, 0 );
     quest.setSeq( Seq4 );
   }
 
@@ -565,6 +567,7 @@ private:
 
   void Scene00029Return( World::Quest &quest, Entity::Player &player, const Event::SceneResult &result )
   {
+    eventMgr().sendEventNotice( player, getId(), 5, 0 );
     quest.setSeq( SeqFinish );
   }