diff --git a/DLLSocket/server_controller.py b/DLLSocket/server_controller.py
index 392cf889bce..3e2af289c24 100644
--- a/DLLSocket/server_controller.py
+++ b/DLLSocket/server_controller.py
@@ -92,6 +92,10 @@ def Compile(serverState):
 	if serverState:
 		send_nudge('Update completed. Restarting...')
 		log.info('Server updated. Restarting...')
+	
+	# Recheck in a bit to be sure
+	lastState=False
+	
 	subprocess.call(RESTART_COMMAND,shell=True)
 	
 def PerformServerReadyCheck(serverState):
diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index d5759d25881..fc56a7d8c66 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -30,6 +30,9 @@ obj/machinery/door/airlock/receive_signal(datum/signal/signal)
 			update_icon()
 
 		if("toggle_lock")
+			if(!density)
+				close(1)
+				sleep(2)
 			locked = !locked
 			update_icon()
 
diff --git a/maps/tgstation.2.1.0.0.1.dmm b/maps/tgstation.2.1.0.0.1.dmm
index d03e6bf3738..c57644179f6 100644
--- a/maps/tgstation.2.1.0.0.1.dmm
+++ b/maps/tgstation.2.1.0.0.1.dmm
@@ -87,7 +87,7 @@
 "abI" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/security/gas_chamber)
 "abJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/gas_chamber)
 "abK" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/wall/r_wall,/area/security/gas_chamber)
-"abL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/machinery/door/airlock/highsecurity{g_amt = 1439; id_tag = "gas_chamber_access"; name = "Gas Chamber Access"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "white"},/area/security/gas_chamber)
+"abL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/machinery/door/airlock/highsecurity{frequency = 1439; id_tag = "gas_chamber_access"; name = "Gas Chamber Access"; req_access_txt = "2"},/turf/simulated/floor{icon_state = "white"},/area/security/gas_chamber)
 "abM" = (/obj/machinery/portable_atmospherics/scrubber/huge/stationary,/obj/machinery/atmospherics/pipe/simple{dir = 6},/turf/simulated/floor/plating,/area/security/prison)
 "abN" = (/obj/machinery/vending/snack,/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)
 "abO" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/prison)