diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index e4e3e17481..76a7a11889 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -48,7 +48,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_shrine_of_the_birds' WHERE `en
 UPDATE `gameobject_template` SET `ScriptName`='go_matrix_punchograph' WHERE `entry` IN (142345,142475,142476,142696);
 UPDATE `gameobject_template` SET `ScriptName`='go_jotunheim_cage' WHERE `entry`=192135;
 UPDATE `gameobject_template` SET `scriptname` = 'go_inconspicuous_landmark' WHERE `entry`=142189;
-
+UPDATE `gameobject_template` SET `ScriptName` = 'go_soulwell' WHERE `entry` IN (181621,193169);
 
 /* GUARD */
 UPDATE `creature_template` SET `ScriptName`='guard_azuremyst' WHERE `entry`=18038;
@@ -1338,6 +1338,7 @@ UPDATE `instance_template` SET `script`='instance_wailing_caverns' WHERE map=43;
 UPDATE `creature_template` SET `ScriptName`='npcs_dithers_and_arbington' WHERE `entry` IN (11056,11057);
 UPDATE `creature_template` SET `ScriptName`='npc_the_scourge_cauldron' WHERE `entry`=11152;
 UPDATE `creature_template` SET `ScriptName`='npc_myranda_the_hag' WHERE `entry`=11872;
+UPDATE `creature_template` SET `ScriptName`='npc_andorhal_tower' WHERE `entry` in (10902,10903,10904,10905);
 
 /* WESTFALL */
 UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`=467;
diff --git a/sql/updates/7285_world_script_waypoint.sql b/sql/updates/7285_world_script_waypoint.sql
index fe11d7dbe4..ca4b4e35e3 100644
--- a/sql/updates/7285_world_script_waypoint.sql
+++ b/sql/updates/7285_world_script_waypoint.sql
@@ -10,4 +10,3 @@ INSERT INTO `script_waypoint` VALUES
 (35491,8,761.823,625.299,418.482,0,''),
 (35491,9,755.923,631.506,413.966,0,''),
 (35491,10,744.841,634.505,411.575,0,'');
-
diff --git a/sql/updates/7285_world_scriptname.sql b/sql/updates/7285_world_scriptname.sql
index 7265c6e040..3f57f64afc 100644
--- a/sql/updates/7285_world_scriptname.sql
+++ b/sql/updates/7285_world_scriptname.sql
@@ -9,4 +9,3 @@ UPDATE `instance_template` SET `script`='instance_trial_of_the_champion' WHERE `
 UPDATE `creature_template` SET `ScriptName`='npc_argent_soldier'  WHERE `entry` IN (35309,35305,35307);
 UPDATE `creature_template` SET `ScriptName`='npc_black_knight_skeletal_gryphon' WHERE `entry`=35491;
 UPDATE `creature_template` SET `AIName`='PassiveAI' WHERE `entry` IN (35332,35330,35328,35327,35331,35329,35325,35314,35326,35323);
-
diff --git a/sql/updates/7293_world_creature_template.sql b/sql/updates/7293_world_scriptname.sql
similarity index 100%
rename from sql/updates/7293_world_creature_template.sql
rename to sql/updates/7293_world_scriptname.sql
diff --git a/sql/updates/7296_world_creature_template.sql b/sql/updates/7296_world_creature_template.sql
new file mode 100644
index 0000000000..82a9121e54
--- /dev/null
+++ b/sql/updates/7296_world_creature_template.sql
@@ -0,0 +1,4 @@
+-- Add Spell "Launch Spear" to creature "Ymirheim Spear Gun"
+UPDATE `creature_template` SET `spell1`=59894 WHERE `entry`=31280;
+-- Add necessary spells for vehicles (for rev 7285).
+UPDATE `creature_template` SET `spell1`=68505,`spell2`=62575,`spell3`=68282,`spell4`=66482 WHERE `entry` IN (36558,35644);