diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index c42b1811c26..ebc0db47c32 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -60,7 +60,7 @@
 			var/mob/living/carbon/M = T.imp_in
 			var/loc_display = "Unknown"
 			var/health_display = "OK"
-			var/total_loss = round(M.getOxyLoss() + M.getToxLoss() + M.getFireLoss() + M.getBruteLoss(), 1)
+			var/total_loss = (M.maxHealth - M.health)
 			if(M.stat == DEAD)
 				health_display = "DEAD"
 			else if(total_loss)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 7013f1d73b1..973919499b3 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -95,7 +95,7 @@
 		..()
 		return
 
-	if(flags & NODROP)
+	if(!usr.canUnEquip(src))
 		return
 
 	var/obj/item/clothing/ears/O