diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
index 99d3ef1df6d7..bc6adc026b6e 100644
--- a/code/game/gamemodes/cm_initialize.dm
+++ b/code/game/gamemodes/cm_initialize.dm
@@ -580,11 +580,11 @@ Additional game mode variables.
 	var/list/selection_list = list()
 	var/list/selection_list_structure = list()
 
-	if(hive.hive_location && hive.hive_location.lesser_drone_spawns >= 1)
+	if(hive.hive_location?.lesser_drone_spawns >= 1)
 		selection_list += "hive core"
 		selection_list_structure += hive.hive_location
 
-	for(var/obj/effect/alien/resin/special/pylon/cycled_pylon in hive.hive_structures[XENO_STRUCTURE_PYLON])
+	for(var/obj/effect/alien/resin/special/pylon/cycled_pylon as anything in hive.hive_structures[XENO_STRUCTURE_PYLON])
 		if(cycled_pylon.lesser_drone_spawns >= 1)
 			selection_list += "[cycled_pylon.name] at [get_area(cycled_pylon)]"
 			selection_list_structure += cycled_pylon
@@ -593,7 +593,7 @@ Additional game mode variables.
 		to_chat(xeno_candidate, SPAN_WARNING("The selected hive does not have enough power for a lesser drone at any hive core or pylon!"))
 		return FALSE
 
-	var/prompt = tgui_input_list(usr, "Select spawn?", "Spawnpoint Selection", selection_list)
+	var/prompt = tgui_input_list(xeno_candidate, "Select spawn?", "Spawnpoint Selection", selection_list)
 	if(!prompt)
 		return FALSE
 
diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm
index 77df91b8940b..fd12080cbf5f 100644
--- a/code/modules/cm_aliens/structures/special/pylon_core.dm
+++ b/code/modules/cm_aliens/structures/special/pylon_core.dm
@@ -119,7 +119,7 @@
 	if(!linked_hive.can_spawn_as_lesser_drone(xeno_candidate))
 		return FALSE
 
-	var/mob/living/carbon/xenomorph/lesser_drone/new_drone = new /mob/living/carbon/xenomorph/lesser_drone(loc, null, linked_hive.hivenumber)
+	var/mob/living/carbon/xenomorph/lesser_drone/new_drone = new(loc, null, linked_hive.hivenumber)
 	xeno_candidate.mind.transfer_to(new_drone, TRUE)
 	lesser_drone_spawns -= 1
 	new_drone.visible_message(SPAN_XENODANGER("A lesser drone emerges out of [src]!"), SPAN_XENODANGER("You emerge out of [src] and awaken from your slumber. For the Hive!"))
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index 5b0bfb95d96a..232a1830ca11 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -1038,7 +1038,7 @@
 
 /datum/hive_status/proc/update_hugger_limit()
 	var/iterator = 0
-	for(var/mob/living/carbon/xenomorph/cycled_xeno in totalXenos)
+	for(var/mob/living/carbon/xenomorph/cycled_xeno as anything in totalXenos)
 		if(cycled_xeno.counts_for_slots)
 			iterator++
 		if(iterator >= 4)
@@ -1097,7 +1097,7 @@
 
 /datum/hive_status/proc/update_lesser_drone_limit()
 	var/iterator = 0
-	for(var/mob/living/carbon/xenomorph/cycled_xeno in totalXenos)
+	for(var/mob/living/carbon/xenomorph/cycled_xeno as anything in totalXenos)
 		if(cycled_xeno.counts_for_slots)
 			iterator++
 		if(iterator >= 3)