diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
index 01eb2cb2075..0f4d586fdcc 100644
--- a/code/game/machinery/Beacon.dm
+++ b/code/game/machinery/Beacon.dm
@@ -4,7 +4,7 @@
 	name = "Bluespace Gigabeacon"
 	desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
 	level = 1		// underfloor
-	layer = WIRE_LAYER+0.001
+	layer = TRANSPARENT_TURF_LAYER
 	anchored = 1
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 0
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 7edbfaa217c..9b22b25cc4c 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -8,7 +8,7 @@
 	name = "navigation beacon"
 	desc = "A radio beacon used for bot navigation."
 	level = 1		// underfloor
-	layer = WIRE_LAYER+0.001
+	layer = TRANSPARENT_TURF_LAYER
 	anchored = 1
 	max_integrity = 500
 	armor = list(melee = 70, bullet = 70, laser = 70, energy = 70, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 63132c315fb..7330819e7d0 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -90,7 +90,7 @@
 /obj/blob_act(obj/structure/blob/B)
 	if(isturf(loc))
 		var/turf/T = loc
-		if(T.intact && level == 1 || T.transparent_floor) //the blob doesn't destroy thing below the floor
+		if((T.intact && level == 1) || T.transparent_floor) //the blob doesn't destroy thing below the floor
 			return
 	take_damage(400, BRUTE, "melee", 0, get_dir(src, B))
 
@@ -199,7 +199,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
 /obj/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
 	if(isturf(loc))
 		var/turf/T = loc
-		if(T.intact && level == 1 || T.transparent_floor) //fire can't damage things hidden below the floor.
+		if((T.intact && level == 1) || T.transparent_floor) //fire can't damage things hidden below the floor.
 			return
 	..()
 	if(exposed_temperature && !(resistance_flags & FIRE_PROOF))
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 9dffdfb049a..0f0dc601f86 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -76,12 +76,12 @@
 			return TRUE
 		var/obj/item/stack/sheet/R = C
 		if(R.get_amount() < 2)
-			to_chat(user, "<span class='warning'>You need two sheets of [C] to build a [C] floor!</span>")
+			to_chat(user, "<span class='warning'>You need two sheets to build a [C.name] floor!</span>")
 			return TRUE
 		else
 			to_chat(user, "<span class='notice'>You begin swapping the plating for [C]...</span>")
 			if(do_after(user, 3 SECONDS * C.toolspeed, target = src))
-				if(R.get_amount() >= 2 && !istype(src, /turf/simulated/floor/transparent/glass))
+				if(R.get_amount() >= 2 && !transparent_floor)
 					if(istype(C, /obj/item/stack/sheet/plasmaglass)) //So, what type of glass floor do we want today?
 						ChangeTurf(/turf/simulated/floor/transparent/glass/plasma)
 					else if(istype(C, /obj/item/stack/sheet/plasmarglass))
diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm
index 5624d4ba802..ce6d693a064 100644
--- a/code/game/turfs/simulated/floor/transparent.dm
+++ b/code/game/turfs/simulated/floor/transparent.dm
@@ -32,30 +32,31 @@
 		var/obj/item/stack/R = user.get_inactive_hand()
 		if(istype(R, /obj/item/stack/sheet/metal))
 			if(R.get_amount() < 2) //not enough metal in the stack
-				to_chat(user, "<span class='danger'>You also need to hold two sheets of metal to dismantle \the [src]!</span>")
+				to_chat(user, "<span class='danger'>You also need to hold two sheets of metal to dismantle [src]!</span>")
 				return
 			else
-				to_chat(user, "<span class='notice'>You begin replacing \the [src]...</span>")
+				to_chat(user, "<span class='notice'>You begin replacing [src]...</span>")
 				playsound(src, C.usesound, 80, TRUE)
 				if(do_after(user, 3 SECONDS * C.toolspeed, target = src))
 					if(R.get_amount() >= 2 && !istype(src, /turf/simulated/floor/plating))
 						if(!transparent_floor)
 							return
-						if(istype(src, /turf/simulated/floor/transparent/glass/reinforced)) //What material is returned? Depends on the turf
-							new /obj/item/stack/sheet/rglass(src, 2)
-						else if(istype(src, /turf/simulated/floor/transparent/glass))
-							new /obj/item/stack/sheet/glass(src, 2)
-						else if(istype(src, /turf/simulated/floor/transparent/glass/plasma))
-							new /obj/item/stack/sheet/plasmaglass(src, 2)
-						else if(istype(src, /turf/simulated/floor/transparent/glass/reinforced/plasma))
-							new /obj/item/stack/sheet/plasmarglass(src, 2)
-						else if(istype(src, /turf/simulated/floor/transparent/glass/titanium))
-							new /obj/item/stack/sheet/titaniumglass(src, 2)
-						else if(istype(src, /turf/simulated/floor/transparent/glass/titanium/plastic))
-							new /obj/item/stack/sheet/plastitaniumglass(src, 2)
-						R.use(2)
-						ChangeTurf(/turf/simulated/floor/plating)
-
+		switch(type) //What material is returned? Depends on the turf
+			if(/turf/simulated/floor/transparent/glass/reinforced)
+				new /obj/item/stack/sheet/rglass(src, 2)
+			if(/turf/simulated/floor/transparent/glass)
+				new /obj/item/stack/sheet/glass(src, 2)
+			if(/turf/simulated/floor/transparent/glass/plasma)
+				new /obj/item/stack/sheet/plasmaglass(src, 2)
+			if(/turf/simulated/floor/transparent/glass/reinforced/plasma)
+				new /obj/item/stack/sheet/plasmarglass(src, 2)
+			if(/turf/simulated/floor/transparent/glass/titanium)
+				new /obj/item/stack/sheet/titaniumglass(src, 2)
+			if(/turf/simulated/floor/transparent/glass/titanium/plastic)
+				new /obj/item/stack/sheet/plastitaniumglass(src, 2)
+			R.use(2)
+			playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE)
+			ChangeTurf(/turf/simulated/floor/plating)
 		else //not holding metal at all
 			to_chat(user, "<span class='danger'>You also need to hold two sheets of metal to dismantle \the [src]!</span>")
 			return
@@ -88,9 +89,9 @@
 
 /turf/simulated/floor/transparent/glass/titanium
 	name = "titanium glass floor"
-	canSmoothWith = list(/turf/simulated/floor/transparent/glass/titanium, /turf/simulated/floor/transparent/glass/titanium/plastic)
 	desc = "Stylish AND strong!"
 	icon = 'icons/turf/floors/titaniumglass.dmi'
+	canSmoothWith = list(/turf/simulated/floor/transparent/glass/titanium, /turf/simulated/floor/transparent/glass/titanium/plastic)
 	thermal_conductivity = 0.025
 	heat_capacity = 325000
 
diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm
index affe463c0b0..2ad433f0930 100644
--- a/code/modules/atmospherics/machinery/atmospherics.dm
+++ b/code/modules/atmospherics/machinery/atmospherics.dm
@@ -217,7 +217,7 @@ Pipelines + Other Objects -> Pipe network
 	else
 		if(T.transparent_floor)
 			to_chat(user, "<span class='danger'>You can't interact with something that's under the floor!</span>")
-			return
+			return TRUE
 		return ..()
 
 //Called when an atmospherics object is unwrenched while having a large pressure difference