diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index b6162bf8f45..4dcccb2145d 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -55,13 +55,13 @@
 
 /obj/structure/mirror/attackby(obj/item/I, mob/living/user, params)
 	if(isscrewdriver(I))
-		visible_message("<span class='notice'>[user] begins to unfasten the [src].</span>", "<span class='notice'>You begin to unfasten the [name].</span>")
+		user.visible_message("<span class='notice'>[user] begins to unfasten [src].</span>", "<span class='notice'>You begin to unfasten [src].</span>")
 		if(do_after(user, 30 * I.toolspeed, target = src))
 			if(shattered)
-				visible_message("<span class='notice'>[user] drops the broken shards to the floor.</span>", "<span class='notice'>You drop the broken shards on the floor.</span>")
+				user.visible_message("<span class='notice'>[user] drops the broken shards to the floor.</span>", "<span class='notice'>You drop the broken shards on the floor.</span>")
 				new /obj/item/weapon/shard(get_turf(user))
 			else
-				visible_message("<span class='notice'>[user] carefully places [src] on the floor.</span>", "<span class='notice'>You carefully place [src] on the floor.</span>")
+				user.visible_message("<span class='notice'>[user] carefully places [src] on the floor.</span>", "<span class='notice'>You carefully place [src] on the floor.</span>")
 				new /obj/item/mounted/mirror(get_turf(user))
 			qdel(src)
 			return
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 6844f27f475..54784c7948f 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -614,7 +614,7 @@
 					update_icon()
 			if("Rotate")
 				var/list/dir_choices = list("North" = NORTH, "East" = EAST, "South" = SOUTH, "West" = WEST)
-				var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in dir_choices
+				var/selected = input(user, "Select a direction for the connector.", "Connector Direction") in dir_choices
 				dir = dir_choices[selected]
 				update_icon()	//is this necessary? probably not
 		return
@@ -696,7 +696,7 @@
 		return
 	if(proximity_flag != 1) //if we aren't next to the wall
 		return
-	if(!(get_dir(on_wall,user) in cardinal))
+	if(!(get_dir(on_wall, user) in cardinal))
 		to_chat(user, "<span class='warning'>You need to be standing next to a wall to place \the [src].</span>")
 		return
 	return 1
@@ -738,7 +738,7 @@
 	if(result in T.contents)
 		to_chat(user, "<span class='warning'>There's already \an [result_name] here.</span>")
 		return
-	visible_message("<span class='notice'>[user] begins assembling a new [result_name].</span>", "<span class='notice'>You begin assembling a new [result_name].</span>")
+	user.visible_message("<span class='notice'>[user] begins assembling a new [result_name].</span>", "<span class='notice'>You begin assembling a new [result_name].</span>")
 	if(do_after(user, 30, target = user))
 		visible_message("<span class='notice'>[user] finishes building a new [result_name]!</span>", "<span class='notice'>You finish building a new [result_name]!</span>")
 		var/obj/structure/S = new result(T)