diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index d7b7a132570..b00635bff7e 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -311,6 +311,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
 			newname = reject_bad_name(newname,allow_numbers)	//returns null if the name doesn't meet some basic requirements. Tidies up a few other things like bad-characters.
 
 			for(var/mob/living/M in player_list)
+				if(M == src)
+					continue
 				if(!newname || M.real_name == newname)
 					newname = null
 					break
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index b37060a78c2..ef39b96db8d 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -167,11 +167,11 @@ rcd light flash thingy on matter drain
 						C.upgradeMotion()
 						upgraded = 1
 						// Add it to machines that process
-						machines |= src
+						machines |= C
 
 					if(upgraded)
 						UC.uses --
-						C.visible_message("<span class='notice'>\icon[src] *beep*</span>")
+						C.visible_message("<span class='notice'>\icon[C] *beep*</span>")
 						usr << "Camera successully upgraded!"
 					else
 						usr << "This camera is already upgraded!"
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index df7c086be6f..7525e90fe75 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -1,6 +1,6 @@
 //Lallander was here
 /mob/living/carbon/human/whisper(message as text)
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+	message = trim(copytext(strip_html_simple(message), 1, MAX_MESSAGE_LEN))
 
 	if (!message || silent || miming)
 		return
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 8113b923506..768801d7209 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -401,7 +401,7 @@ var/list/slot_equipment_priority = list( \
 		src << browse('html/changelog.html', "window=changes;size=675x650")
 		client.changes = 1
 
-/client/var/ghost_ears = 1
+/client/var/ghost_ears = 0
 /client/verb/toggle_ghost_ears()
 	set name = "Ghost ears"
 	set category = "OOC"
@@ -412,7 +412,7 @@ var/list/slot_equipment_priority = list( \
 	else
 		usr << "\blue Now you hear speech only from nearest creatures."
 
-/client/var/ghost_sight = 1
+/client/var/ghost_sight = 0
 /client/verb/toggle_ghost_sight()
 	set name = "Ghost sight"
 	set category = "OOC"