diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 96c51417be0..ed05c53a8c0 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2047,7 +2047,7 @@
 
 			//TODO: Generalize admin shuttles, make 'Move Shuttle' adminverb.
 			if("moveminingshuttle")
-				if(shuttle_moving["Mining"] || shuttle_moving["Mining"] == null)
+				if(shuttle_moving["Mining"] || isnull(shuttle_moving["Mining"]))
 					return
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","ShM")
diff --git a/code/modules/shuttles/engineering.dm b/code/modules/shuttles/engineering.dm
index 2de57d8118f..570229afc15 100644
--- a/code/modules/shuttles/engineering.dm
+++ b/code/modules/shuttles/engineering.dm
@@ -1,11 +1,9 @@
 /obj/machinery/computer/shuttle_control/engineering
 	name = "engineering shuttle console"
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "shuttle"
 	shuttle_tag = "Engineering"
 	req_access = list(access_engine)
 	circuit = "/obj/item/weapon/circuitboard/engineering_shuttle"
-	location = 1
+	location = 1 //Starts offstation.
 
 /obj/machinery/computer/shuttle_control/engineering/New()
 	offsite = locate(/area/shuttle/constructionsite/site)
diff --git a/code/modules/shuttles/mining.dm b/code/modules/shuttles/mining.dm
index f0c8551b537..ecd3e40ac89 100644
--- a/code/modules/shuttles/mining.dm
+++ b/code/modules/shuttles/mining.dm
@@ -1,7 +1,5 @@
 /obj/machinery/computer/shuttle_control/mining
 	name = "mining shuttle console"
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "shuttle"
 	shuttle_tag = "Mining"
 	req_access = list(access_mining)
 	circuit = "/obj/item/weapon/circuitboard/mining_shuttle"
diff --git a/code/modules/shuttles/research.dm b/code/modules/shuttles/research.dm
index b75dd35fe6d..fa5ebe749f9 100644
--- a/code/modules/shuttles/research.dm
+++ b/code/modules/shuttles/research.dm
@@ -1,7 +1,5 @@
 /obj/machinery/computer/shuttle_control/research
 	name = "research shuttle console"
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "shuttle"
 	shuttle_tag = "Research"
 	req_access = list(access_research)
 	circuit = "/obj/item/weapon/circuitboard/research_shuttle"