diff --git a/code/modules/pool/pool_drain.dm b/code/modules/pool/pool_drain.dm
index 440cd42cff..940f7cd219 100644
--- a/code/modules/pool/pool_drain.dm
+++ b/code/modules/pool/pool_drain.dm
@@ -94,7 +94,7 @@
 								H.adjustBruteLoss(2)
 								to_chat(H, "<span class='danger'>You're caught in the drain!</span>")
 							else
-								H.apply_damage(2.5, BRUTE, pick("l_leg", "r_leg")) //drain should only target the legs
+								H.apply_damage(2.5, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) //drain should only target the legs
 								to_chat(H, "<span class='danger'>Your legs are caught in the drain!</span>")
 			else
 				for(var/turf/open/pool/P in controller.linked_turfs)
diff --git a/code/modules/pool/pool_main.dm b/code/modules/pool/pool_main.dm
index ca1c788c9d..2b260b5c0b 100644
--- a/code/modules/pool/pool_main.dm
+++ b/code/modules/pool/pool_main.dm
@@ -74,7 +74,7 @@
 /turf/open/pool/Exit(atom/movable/AM, atom/newloc)
 	if(!AM.has_gravity(src))
 		return ..()
-	if(isliving(AM) || istype(AM, /obj/structure))
+	if(isliving(AM) || isstructure(AM))
 		if(AM.throwing)
 			return ..()			//WHEEEEEEEEEEE
 		if(istype(AM, /obj/structure) && isliving(AM.pulledby))