diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index b6018c65626..3ce114bde9b 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -268,6 +268,8 @@
 		return BORDER_BETWEEN
 	if(istype(T2, /turf/simulated/wall))
 		return BORDER_2NDTILE
+	if(istype(T2, /turf/simulated/mineral))
+		return BORDER_2NDTILE
 	if(!istype(T2, /turf/simulated))
 		return BORDER_BETWEEN
 
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 79cfc3ae9f8..0670c87e20d 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -522,6 +522,17 @@ var/global/list/rockTurfEdgeCache = list(
 				O.attackby(W,user)
 				return
 
+	if(istype(W, /obj/item/stack/tile/plasteel) && isarea(loc))
+		var/area/A = loc
+		if(A.outdoors)
+			to_chat(user, "<span class='warning'>You must define a room as part of the station using blueprints or an equivalent item first.</span>")
+			return
+		playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
+		make_plating()
+		icon_plating = "plating"
+		icon_state = "plating"
+		update_icon()
+
 /turf/simulated/floor/plating/airless/asteroid/gets_drilled()
 	if(!dug)
 		gets_dug()
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index c5230ea689f..5a226dc20f2 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -840,6 +840,12 @@
 	shuttleId = "freegolem"
 	possible_destinations = "freegolem_z3;freegolem_z5;freegolem_z1;freegolem_z6"
 
+/obj/machinery/computer/shuttle/golem_ship/attack_hand(mob/user)
+	if(!isgolem(user))
+		to_chat(user, "<span class='warning'>Access denied.</span>")
+		return
+	..()
+
 /obj/machinery/computer/shuttle/vox
 	name = "skipjack control console"
 	req_access = list(access_vox)