diff --git a/.travis.yml b/.travis.yml
index f47db96174..6b0a88de28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ sudo: false
 env:
   BYOND_MAJOR="508"
   BYOND_MINOR="1293"
-  MACRO_COUNT=1151
+  MACRO_COUNT=1133
   
 cache:
   directories:
diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index 1e4525d355..24754c2270 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -3,7 +3,7 @@
  */
 /obj/effect/acid
 	name = "acid"
-	desc = "Burbling ccorrosive stuff. Probably a bad idea to roll around in it."
+	desc = "Burbling corrosive stuff. Probably a bad idea to roll around in it."
 	icon_state = "acid"
 	icon = 'icons/mob/alien.dmi'
 
diff --git a/code/game/objects/structures/alien/egg.dm b/code/game/objects/structures/alien/egg.dm
index 472fa8b020..4e8b00812f 100644
--- a/code/game/objects/structures/alien/egg.dm
+++ b/code/game/objects/structures/alien/egg.dm
@@ -10,7 +10,7 @@
 
 /obj/structure/alien/egg/New()
 	..()
-	processing_objects |= src
+	processing_objects += src
 
 /obj/structure/alien/egg/Destroy()
 	processing_objects -= src
diff --git a/code/game/objects/structures/alien/node.dm b/code/game/objects/structures/alien/node.dm
index cbee126320..15a9062862 100644
--- a/code/game/objects/structures/alien/node.dm
+++ b/code/game/objects/structures/alien/node.dm
@@ -7,7 +7,7 @@
 
 /obj/structure/alien/node/New()
 	..()
-	processing_objects |= src
+	processing_objects += src
 
 /obj/structure/alien/node/Destroy()
 	processing_objects -= src
diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm
index cb26c6b5c3..57e3427163 100644
--- a/code/modules/mob/living/carbon/alien/larva/powers.dm
+++ b/code/modules/mob/living/carbon/alien/larva/powers.dm
@@ -4,7 +4,7 @@
 	if(!istype(loc, /turf))
 		src << "<span class='danger'>You cannot infest a target in your current position.</span>"
 		return 0
-	if(stat)
+	if(incapacitated())
 		src << "<span class='danger'>You cannot infest a target in your current state.</span>"
 		return 0
 	if(!M)
@@ -28,7 +28,7 @@
 
 	var/list/choices = list()
 	for(var/mob/living/carbon/human/H in view(1,src))
-		if(istype(H.species, /datum/species/xenos)) //Kinda gross, but easier and cleaner than a string check.
+		if(isxenomorph(H))
 			continue
 		if(src.Adjacent(H) && H.lying)
 			choices += H
@@ -61,7 +61,7 @@
 	set name = "Release Host"
 	set desc = "Release your host."
 
-	if(stat)
+	if(incapacitated())
 		src << "You cannot leave your host in your current state."
 		return