diff --git a/code/modules/research/nanites/nanite_programs/buffing.dm b/code/modules/research/nanites/nanite_programs/buffing.dm
index a26cb7bd68..4e5cc46c8f 100644
--- a/code/modules/research/nanites/nanite_programs/buffing.dm
+++ b/code/modules/research/nanites/nanite_programs/buffing.dm
@@ -12,6 +12,12 @@
 		var/mob/living/carbon/human/H = host_mob
 		H.physiology.stun_mod *= 0.5
 
+/datum/nanite_program/nervous/active_effect()
+	. = ..()
+	if(iscarbon(host_mob))
+		var/mob/living/carbon/C = host_mob
+		C.adjustStaminaLoss(-5)
+
 /datum/nanite_program/nervous/disable_passive_effect()
 	. = ..()
 	if(ishuman(host_mob))
diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm
index 00a1f15e31..418039757c 100644
--- a/code/modules/research/nanites/nanite_programs/healing.dm
+++ b/code/modules/research/nanites/nanite_programs/healing.dm
@@ -228,12 +228,12 @@
 	var/obj/item/organ/brain/BR = C.getorgan(/obj/item/organ/brain)
 	if(QDELETED(BR) || BR.damaged_brain)
 		return FALSE
-	if(!C.get_ghost())
+	if(!C.ckey && !C.get_ghost())
 		return FALSE
 	return TRUE
 
 /datum/nanite_program/triggered/defib/proc/zap()
-	if(check_revivable())
+	if(check_revivable() && host_mob.ckey)
 		var/mob/living/carbon/C = host_mob
 		playsound(C, 'sound/machines/defib_success.ogg', 50, 0)
 		C.set_heartattack(FALSE)
@@ -246,5 +246,5 @@
 			C.adjustBrainLoss( max(0, ((1800 - tplus) / 1800 * 150)), 150)
 		log_game("[C] has been successfully defibrillated by nanites.")
 	else
-		playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
+		playsound(host_mob, 'sound/machines/defib_failed.ogg', 50, 0)