diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json
index b5aece6439..5fa1415fbe 100644
--- a/region/norfair/east/Bubble Mountain.json	
+++ b/region/norfair/east/Bubble Mountain.json	
@@ -3941,12 +3941,13 @@
       "requires": [
         {"tech": "canBombHorizontally"},
         "h_artificialMorphPowerBomb",
-        "h_additionalBomb"
+        "h_additionalBomb",
+        "canTrickyDodgeEnemies"
       ],
       "flashSuitChecked": true,
       "note": [
-        "Use one Power Bomb to jump towards the Cacatac then a second to jump over it and down below.",
-        "Do not land where the Cacatac was, or Samus will get hit by its invisible spikes."
+        "Wait for the Waver to pass or quickly use a Power Bomb to boost over the gap towards the Cacatac.",
+        "Use a second Power Bomb to jump over it and down below; hold left as soon as Samus starts moving upward, in order to avoid the invisible Cacatac spikes."
       ]
     },
     {
@@ -4397,7 +4398,7 @@
         {"or": [
           "h_artificialMorphPowerBomb",
           {"and": [
-            "canTrickyJump",
+            "canTrickyDodgeEnemies",
             {"or": [
               "canBePatient",
               "canDoubleBombJump"
@@ -4438,7 +4439,7 @@
         {"or": [
           "h_artificialMorphPowerBomb",
           {"and": [
-            "canTrickyJump",
+            "canTrickyDodgeEnemies",
             "canBePatient",
             {"or": [
               "canBeVeryPatient",
diff --git a/region/norfair/east/Cathedral Entrance.json b/region/norfair/east/Cathedral Entrance.json
index 6648ce510b..093429a392 100644
--- a/region/norfair/east/Cathedral Entrance.json	
+++ b/region/norfair/east/Cathedral Entrance.json	
@@ -483,7 +483,7 @@
       ],
       "flashSuitChecked": true,
       "note": [
-        "Carefully roll under the Sm. Desgeegas or kill them with a Power Bomb (while avoiding killing the Sova).",
+        "Wait for the Sova to pass then carefully roll under the Sm. Desgeegas or kill them with a Power Bomb (while avoiding killing the Sova).",
         "It is possible to kill a Sova on the door and pause abuse to grab its Energy drop on G-mode exit.",
         "The local or global Sova can be used. To use the local one, keep it off camera when possible and horizontally boost to jump over both stairs at once.",
         "With Spring Ball or a moderately good IBJ, Samus should be able to get through the morph tunnel before the global Sova, otherwise it takes just over a minute for it to return."
diff --git a/region/norfair/east/Frog Speedway.json b/region/norfair/east/Frog Speedway.json
index 9ef70e7a3e..10d8e73340 100644
--- a/region/norfair/east/Frog Speedway.json	
+++ b/region/norfair/east/Frog Speedway.json	
@@ -303,7 +303,7 @@
         "h_artificialMorphBombs",
         {"or": [
           "h_artificialMorphPowerBomb",
-          "canTrickyJump",
+          "canTrickyDodgeEnemies",
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
           {"and": [
             "Morph",
diff --git a/region/norfair/east/Green Bubbles Tunnel.json b/region/norfair/east/Green Bubbles Tunnel.json
index 52d31b08ea..807049f3b3 100644
--- a/region/norfair/east/Green Bubbles Tunnel.json	
+++ b/region/norfair/east/Green Bubbles Tunnel.json	
@@ -265,7 +265,7 @@
             {"heatFrames": 130},
             {"enemyKill": {
               "enemies": [["Geruta"]],
-              "explicitWeapons": ["Super", "Missile", "Plasma", "Wave"]
+              "explicitWeapons": ["Super", "Missile", "Plasma", "Wave", "PowerBomb"]
             }}
           ]}
         ]}
diff --git a/region/norfair/east/Lower Norfair Elevator.json b/region/norfair/east/Lower Norfair Elevator.json
index e7acd32727..9ade2a3674 100644
--- a/region/norfair/east/Lower Norfair Elevator.json	
+++ b/region/norfair/east/Lower Norfair Elevator.json	
@@ -415,6 +415,11 @@
       "requires": [
         {"heatFrames": 0}
       ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
       "flashSuitChecked": true
     },
     {
@@ -753,6 +758,11 @@
       "requires": [
         {"heatFrames": 0}
       ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
       "flashSuitChecked": true
     },
     {