diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index b0fcf7fd568..46efa71e70b 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -8,7 +8,7 @@
 	small = 1
 	pass_flags = 1
 	density = 0
-	holder_type = /obj/item/weapon/holder/pai
+	var/holder_type = /obj/item/weapon/holder/pai
 
 	var/network = "SS13"
 	var/obj/machinery/camera/current = null
@@ -541,7 +541,7 @@
 		pie.MouseDrop(held)
 		pie << "You scoop up [src]."
 		src << "[held] scoops you up."
-		pie.status_flags |= PASSEMOTES
+		//pie.status_flags |= PASSEMOTES
 		held.icon_state = "pai-[icon_state]"
 		return
 
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 1329d4a6a5f..f98e4e839c4 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -570,16 +570,16 @@
 			if (held.viruses)
 				data["infected"] = 1
 				var/virus[0]
-					for(var/datum/disease2/disease/D  in held.viruses)
-						var/vdata[0]
-						vdata["name"] = D.name || "unknown"
-						vdata["type"] = D.spreadtype || "unknown"
-						vdata["stage"] = D.stage || "unknown"
-						vdata["stageMax"] = D.max_stages || "unknown"
-						vdata["cure"] = D.cure || "unknown"
+				for((var/datum/disease2/disease/D in held.viruses))
+					var/vdata[0]
+					vdata["name"] = D.name() || "unknown"
+					vdata["type"] = D.spreadtype || "unknown"
+					vdata["stage"] = D.stage || "unknown"
+					vdata["stageMax"] = D.max_stage || "unknown"
+					vdata["cure"] = D.antigen || "unknown"
 
-						virus[++virus.len]=vdata
-						data["infectionDat"] = virus
+					virus[++virus.len]=vdata
+					data["infectionDat"] = virus
 
 
 		else