diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 1c59c8da830..e8e3d92f642 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -260,7 +260,6 @@
 		paddles.unwield()
 		toggle_paddles()
 		update_icon()
-		return
 
 /obj/item/defibrillator/compact/advanced/loaded/Initialize(mapload)
 	. = ..()
@@ -269,22 +268,18 @@
 
 /obj/item/defibrillator/compact/advanced/emag_act(mob/user)
 	if(world.time > next_emag_message)
-		to_chat(user, "<span class='warning'>You try to silently disable [src]'s safety protocols with the card but it rejects your attempt. Uh oh...")
-		atom_say("Warning: Unauthorised software modification is not advised and might result in the warranty becoming void.")
-		playsound(get_turf(src), 'sound/machines/defib_saftyon.ogg', 50)
+		to_chat(user, "<span class='warning'>You try to silently disable [src]'s safety protocols with the card but it rejects your attempt. Uh oh...</span>")
+		atom_say("Warning: Unauthorised software modification is not advised and may result in the warranty becoming void.")
+		playsound(src, 'sound/machines/defib_saftyon.ogg', 50)
 		next_emag_message = world.time + 1 MINUTES
 	else
-		to_chat(user, "<span class='warning'>You try to silently disable [src]'s safety protocols with the card but nothing happens.")
+		to_chat(user, "<span class='warning'>You try to silently disable [src]'s safety protocols with the card but nothing happens.</span>")
 
 /obj/item/defibrillator/compact/advanced/emp_act(severity)
 	if(world.time > next_emp_message)
 		atom_say("Warning: Electromagnetic pulse detected. Integrated shielding prevented all potential hardware damage.")
-		playsound(get_turf(src), 'sound/machines/defib_saftyon.ogg', 50)
+		playsound(src, 'sound/machines/defib_saftyon.ogg', 50)
 		next_emp_message = world.time + 5 SECONDS
-	else
-		return
-
-
 
 /obj/item/defibrillator/compact/advanced/attackby(obj/item/W, mob/user, params)
 	if(W == paddles)
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index ca976915b0e..65e6108c63c 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -288,7 +288,7 @@
 	name = "self-charging bluespace power cell"
 	desc = "An experimental, self-charging, transdimensional power cell."
 	origin_tech =  "powerstorage=10;bluespace=10"
-	self_recharge = 1
+	self_recharge = TRUE
 
 /obj/item/stock_parts/cell/infinite
 	name = "infinite-capacity power cell!"
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 0f6f5516830..7ce266b522a 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -74,7 +74,7 @@
 
 /datum/design/compact_defib
 	name = "Compact Defibrillator"
-	desc = "A belt-mounted defibrillator that can be rapidly deployed."
+	desc = "A belt-mounted defibrillator for rapid deployment."
 	id = "compact_defib"
 	req_tech = list("materials" = 7, "biotech" = 7, "powerstorage" = 6)
 	build_type = PROTOLATHE