diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1204_The Rise and Fall of a Gentlemen.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1204_The Rise and Fall of a Gentlemen.json
index 9ea22146..ae051bb2 100644
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1204_The Rise and Fall of a Gentlemen.json	
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1204_The Rise and Fall of a Gentlemen.json	
@@ -62,7 +62,8 @@
                     },
                     "TerritoryId": 146,
                     "InteractionType": "Combat",
-                    "EnemySpawnType": "OverworldEnemies"
+                    "EnemySpawnType": "OverworldEnemies",
+                    "KillEnemyDataIds": []
                 }
             ]
         },
diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1207_The Immaculate Deception.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1207_The Immaculate Deception.json
index 4297a40b..540ab83e 100644
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1207_The Immaculate Deception.json	
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1207_The Immaculate Deception.json	
@@ -118,8 +118,6 @@
             "Steps": [
                 {
                     "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-                    "Mount": true,
-                    "Fly": true,
                     "DataId": 1005727,
                     "Position": {
                         "X": -221.11853,
@@ -137,8 +135,6 @@
             "Steps": [
                 {
                     "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-                    "Mount": true,
-                    "Fly": true,
                     "DataId": 1005727,
                     "Position": {
                         "X": -221.11853,
@@ -155,8 +151,6 @@
             "Steps": [
                 {
                     "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-                    "Mount": true,
-                    "Fly": true,
                     "DataId": 1005727,
                     "Position": {
                         "X": -221.11853,
@@ -173,8 +167,6 @@
             "Steps": [
                 {
                     "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-                    "Mount": true,
-                    "Fly": true,
                     "DataId": 1005727,
                     "Position": {
                         "X": -221.11853,
@@ -191,8 +183,6 @@
             "Steps": [
                 {
                     "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-                    "Mount": true,
-                    "Fly": true,
                     "DataId": 1005727,
                     "Position": {
                         "X": -221.11853,
@@ -208,9 +198,6 @@
             "Sequence": 10,
             "Steps": [
                 {
-                    "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
-                    "Mount": true,
-                    "Fly": true,
                     "DataId": 2003006,
                     "Position": {
                         "X": -208.5451,
diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1315_The Science of Deduction.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1315_The Science of Deduction.json
index 06546bc0..03f940e2 100644
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1315_The Science of Deduction.json	
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1315_The Science of Deduction.json	
@@ -6,6 +6,8 @@
             "Sequence": 0,
             "Steps": [
                 {
+                    "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
+                    "SkipConditions": {"AetheryteShortcutIf": {"InSameTerritory": true}},
                     "DataId": 1005884,
                     "Position": {
                         "X": -526.26843,
@@ -39,7 +41,6 @@
                 {
                     "AetheryteShortcut": "Western Thanalan - Horizon",
                     "Mount": true,
-                    "Fly": true,
                     "DataId": 1008709,
                     "Position": {
                         "X": -431.7846,
@@ -68,7 +69,6 @@
                     "InteractionType": "Interact"
                 },
                 {
-                    "AetheryteShortcut": "Western Thanalan - Horizon",
                     "Mount": true,
                     "Fly": true,
                     "DataId": 1002022,
@@ -81,7 +81,6 @@
                     "InteractionType": "Interact"
                 },
                 {
-                    "AetheryteShortcut": "Western Thanalan - Horizon",
                     "Mount": true,
                     "Fly": true,
                     "DataId": 1008715,
diff --git a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1316_The Hammer.json b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1316_The Hammer.json
index b9564fdc..b0d8c5e0 100644
--- a/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1316_The Hammer.json	
+++ b/QuestPaths/2.x - A Realm Reborn/Hildibrand Quests/1316_The Hammer.json	
@@ -64,6 +64,10 @@
                     },
                     "TerritoryId": 147,
                     "InteractionType": "Interact"
+                },
+                {
+                    "TerritoryId": 147,
+                    "InteractionType": "CompleteQuest"
                 }
             ]
         }