diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm
index 8b99078d255..750219dd813 100644
--- a/code/controllers/shuttle_controller.dm
+++ b/code/controllers/shuttle_controller.dm
@@ -205,6 +205,7 @@ var/global/datum/shuttle_controller/shuttle_controller
 	
 	//Gamma Shuttle
 	shuttle = new()
+	shuttle.location = 1
 	shuttle.warmup_time = 10
 	shuttle.area_offsite = locate(/area/shuttle/gamma/space)
 	shuttle.area_station = locate(/area/shuttle/gamma/station)
diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm
index bc785fe46d9..6dd618a1049 100644
--- a/maps/cyberiad.dmm
+++ b/maps/cyberiad.dmm
@@ -3275,7 +3275,7 @@
 "bkY" = (/turf/simulated/floor{dir = 2; icon_state = "whitecorner"},/area/medical/medbreak)
 "bkZ" = (/obj/machinery/vending/snack,/turf/simulated/floor{dir = 8; icon_state = "whitecorner"},/area/medical/medbreak)
 "bla" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit)
-"blb" = (/obj/machinery/camera{c_tag = "Escape Arm Airlocks"; dir = 8; network = list("SS13")},/obj/structure/table,/obj/machinery/atmospherics/pipe/simple,/obj/machinery/embedded_controller/radio/docking_port_multi{child_names_txt = "Airlock Two"; child_tags_txt = "escape_dock_south_airlock"; id_tag = "escape_dock"; pixel_x = 30},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit)
+"blb" = (/obj/machinery/camera{c_tag = "Escape Arm Airlocks"; dir = 8; network = list("SS13")},/obj/structure/table,/obj/machinery/atmospherics/pipe/simple,/obj/machinery/embedded_controller/radio/docking_port_multi{child_names_txt = "Airlock One;Airlock Two"; child_tags_txt = "escape_dock_north_airlock;escape_dock_south_airlock"; id_tag = "escape_dock"; pixel_x = 30},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit)
 "blc" = (/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/obj/structure/table,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/pen,/obj/item/weapon/hand_labeler,/turf/simulated/floor{dir = 9; icon_state = "whitepurple"},/area/toxins/lab)
 "bld" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{tag = "icon-whitepurple (NORTH)"; icon_state = "whitepurple"; dir = 1},/area/toxins/lab)
 "ble" = (/obj/structure/table,/obj/item/clothing/gloves/latex,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor{dir = 5; icon_state = "whitepurple"},/area/toxins/lab)