diff --git a/code/game/events/EventProcs/clang.dm b/code/game/events/EventProcs/clang.dm
index e02f79665a..0524a08f08 100644
--- a/code/game/events/EventProcs/clang.dm
+++ b/code/game/events/EventProcs/clang.dm
@@ -17,7 +17,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	anchored = 1
 
 	Bump(atom/clong)
-		if (istype(clong, /turf))
+		if (istype(clong, /turf) && !istype(clong, /turf/simulated/shuttle) && !istype(clong, /turf/unsimulated))
 			if(clong.density)
 				clong.ex_act(2)
 				for (var/mob/O in hearers(src, null))
@@ -32,6 +32,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 				clong.meteorhit(src)
 		if(clong && prob(25))
 			src.loc = clong.loc
+		else del(src)
 
 /proc/immovablerod()
 
diff --git a/code/game/objects/stacks/glass.dm b/code/game/objects/stacks/glass.dm
index e81bb4217c..6c7ce11a6a 100644
--- a/code/game/objects/stacks/glass.dm
+++ b/code/game/objects/stacks/glass.dm
@@ -19,6 +19,8 @@ SHARDS
 	title += " ([src.amount] sheet\s left)"
 	switch(alert(title, "Would you like full tile glass or one direction?", "one direct", "full (2 sheets)", "cancel", null))
 		if("one direct")
+			if (src.loc != usr)
+				return 1
 			if (src.amount < 1)
 				return 1
 			var/list/directions = new/list(cardinal)
@@ -52,6 +54,8 @@ SHARDS
 			W.anchored = 0
 			src.use(1)
 		if("full (2 sheets)")
+			if (src.loc != usr)
+				return 1
 			if (src.amount < 2)
 				return 1
 			if (locate(/obj/structure/window) in usr.loc)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 11bcdc5bb1..c691bd5326 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -859,6 +859,7 @@
 				else
 					src.malfai = usr
 				malfai << "Hack complete. The APC is now under your exclusive control."
+				updateicon()
 
 	else if (href_list["occupyapc"])
 		malfoccupy(usr)