diff --git a/locations/locations.json b/locations/locations.json
index bd6fccb..c622674 100644
--- a/locations/locations.json
+++ b/locations/locations.json
@@ -1271,8 +1271,8 @@
 			{
 				"name": "Stairs Control Panel",
 				"access_rules": [
-					"$canSolve|158142, @Places/quarryStoneworksUpstairs",
-					"showSnipes, $canSolve|158142, @Places/quarryStoneworks, [@Places/quarryStoneworksUpstairs]"
+					"$isNotPanelsOnlyOrHasPanel|Quarry Stoneworks Stairs (Panel), $canSolve|158142, @Places/quarryStoneworksUpstairs",
+					"showSnipes, $isNotPanelsOnlyOrHasPanel|Quarry Stoneworks Stairs (Panel), $canSolve|158142, @Places/quarryStoneworks, [@Places/quarryStoneworksUpstairs]"
 				]
 			},
 			{
@@ -3543,7 +3543,7 @@
 			{
 				"name": "Rhombic Avoid to Monastery Garden Panel",
 				"visibility_rules": [ "Unrandomized" ],
-				"access_rules": [ "$canSolve|158267, @Places/overworld" ]
+				"access_rules": [ "$isNotPanelsOnlyOrHasPanel|Jungle Monastery Garden Shortcut (Panel), $canSolve|158267, @Places/overworld" ]
 			}
 		],
 		"map_locations": [
@@ -4208,7 +4208,7 @@
 			},
 			{
 				"name": "Shortcut Panels",
-				"access_rules": [ "$canSolve|158341-158342, @Places/swampLaser" ]
+				"access_rules": [ "$isNotPanelsOnlyOrHasPanel|Swamp Laser Shortcut (Panel), $canSolve|158341-158342, @Places/swampLaser" ]
 			}
 		],
 		"map_locations": [
@@ -5540,7 +5540,7 @@
 			{
 				"name": "Shortcut to Mountain Panel",
 				"access_rules": [
-					"$canSolve|158449, @Places/caves",
+					"$isNotPanelsOnlyOrHasPanel|Caves Mountain Shortcut (Panel), $canSolve|158449, @Places/caves",
 					"cavesPool, $canSolve|158449, @Places/caves"
 				]
 			}
@@ -5562,7 +5562,7 @@
 			{
 				"name": "Shortcut to Swamp Panel",
 				"access_rules": [
-					"$canSolve|158450, @Places/caves",
+					"$isNotPanelsOnlyOrHasPanel|Caves Swamp Shortcut (Panel), $canSolve|158450, @Places/caves",
 					"cavesPool, $canSolve|158450, @Places/caves"
 				]
 			}
diff --git a/scripts/archipelago.lua b/scripts/archipelago.lua
index 4432faf..ac2a122 100644
--- a/scripts/archipelago.lua
+++ b/scripts/archipelago.lua
@@ -193,14 +193,17 @@ doors = {
 		"Swamp Sliding Bridge (Panel)",
 		"Swamp Rotating Bridge (Panel)",
 		"Swamp Long Bridge (Panel)",
-		"Swamp Maze Controls (Panel)"},
+		"Swamp Maze Controls (Panel)",
+		"Swamp Laser Shortcut (Panel)"},
 	["Mountain Panels"] = {"Mountain Floor 1 Light Bridge (Panel)",
 		"Mountain Floor 2 Light Bridge Near (Panel)",
 		"Mountain Floor 2 Light Bridge Far (Panel)",
 		"Mountain Floor 2 Elevator Control (Panel)"},
 	["Caves Panels"] = {"Caves Entry (Panel)",
 		"Challenge Entry (Panel)",
-		"Caves Elevator Controls (Panel)"},
+		"Caves Elevator Controls (Panel)",
+		"Caves Mountain Shortcut (Panel)",
+		"Caves Swamp Shortcut (Panel)"},
 	["Tunnels Panels"] = {"Tunnels Entry (Panel)",
 		"Tunnels Town Shortcut (Panel)"}
 }