diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm
index abdb8cbd907..25317a30c92 100644
--- a/code/modules/maps/planet_types/lore/srandmarr.dm
+++ b/code/modules/maps/planet_types/lore/srandmarr.dm
@@ -65,7 +65,8 @@
 	icon_state = "globe1"
 	color = "#cf1020"
 	generated_name = FALSE
-	ruin_planet_type = PLANET_LAVA
+	ruin_planet_type = PLANET_LORE
+	ruin_type_whitelist = list (/datum/map_template/ruin/exoplanet/pra_exploration_drone)
 	ring_chance = 0
 
 /obj/effect/overmap/visitable/sector/exoplanet/lava/sahul/update_icon()
diff --git a/code/modules/overmap/exoplanets/biomes/barren.dm b/code/modules/overmap/exoplanets/biomes/barren.dm
index fb9e3a76f2d..f8952676835 100644
--- a/code/modules/overmap/exoplanets/biomes/barren.dm
+++ b/code/modules/overmap/exoplanets/biomes/barren.dm
@@ -1,5 +1,10 @@
 /singleton/biome/barren
 	turf_type = /turf/simulated/floor/exoplanet/barren
+	generators = list()
+	spawn_types = list()
+
+/singleton/biome/barren/asteroid
+	turf_type = /turf/unsimulated/floor/asteroid/ash
 	generators = list(
 		WILDLIFE = list(POISSON_SAMPLE, 15)
 	)
@@ -13,10 +18,5 @@
 		)
 	)
 
-/singleton/biome/barren/asteroid
-	turf_type = /turf/unsimulated/floor/asteroid/ash
-
 /singleton/biome/barren/raskara
 	turf_type = /turf/simulated/floor/exoplanet/barren/raskara
-	generators = list()
-	spawn_types = list()
diff --git a/code/modules/overmap/exoplanets/biomes/lava.dm b/code/modules/overmap/exoplanets/biomes/lava.dm
index e2463b8aadb..0d09283dbc4 100644
--- a/code/modules/overmap/exoplanets/biomes/lava.dm
+++ b/code/modules/overmap/exoplanets/biomes/lava.dm
@@ -5,8 +5,7 @@
 	turf_type = /turf/unsimulated/floor/asteroid/basalt
 	generators = list(
 		PLANET_TURF = list(BATCHED_NOISE, -0.1, 360, 32),
-		SMALL_FLORA = list(POISSON_SAMPLE, 9),
-		WILDLIFE = list(POISSON_SAMPLE, 15)
+		SMALL_FLORA = list(POISSON_SAMPLE, 9)
 	)
 	exclusive_generators = list(PLANET_TURF)
 	spawn_types = list(
@@ -16,12 +15,5 @@
 		SMALL_FLORA = list(
 			/obj/structure/flora/rock/random = 1,
 			/obj/structure/flora/rock/pile/random = 2
-		),
-		WILDLIFE = list(
-			/mob/living/simple_animal/hostile/gnat = 5,
-			/mob/living/simple_animal/hostile/carp/asteroid = 3,
-			/mob/living/simple_animal/hostile/carp/bloater = 1,
-			/mob/living/simple_animal/hostile/carp/shark/reaver = 1,
-			/mob/living/simple_animal/hostile/carp/shark/reaver/eel = 1
 		)
 	)
diff --git a/html/changelogs/alberyk-planetfixes.yml b/html/changelogs/alberyk-planetfixes.yml
new file mode 100644
index 00000000000..f2e443138d5
--- /dev/null
+++ b/html/changelogs/alberyk-planetfixes.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+  - tweak: "Barren and lava planets no longer have asteroid mobs."
\ No newline at end of file
diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm
index ad93f16b6ba..40715fe6db0 100644
--- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm
+++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm
@@ -39,6 +39,7 @@
 	initial_restricted_waypoints = list(
 		"Spacer Militia Shuttle" = list("nav_hailstorm_shuttle")
 	)
+	invisible_until_ghostrole_spawn = TRUE
 
 /obj/effect/overmap/visitable/ship/hailstorm_ship/New()
 	designation = "[pick("Al'mari", "Champion of the Tajara", "Nated's Revenge", "Mata'ke's Blade", "Star Guerilla", "Dreams of Freedom", "Al'mariist Comet", "Adhomai's Liberator")]"