diff --git a/code/LINDA/LINDA_fire.dm b/code/LINDA/LINDA_fire.dm
index 3198264cd64..621775ae351 100644
--- a/code/LINDA/LINDA_fire.dm
+++ b/code/LINDA/LINDA_fire.dm
@@ -79,7 +79,7 @@
 		location.assume_air(affected)
 
 	for(var/atom/item in loc)
-		if(item) // It's possible that the item is deleted in temperature_expose
+		if(item && item != src) // It's possible that the item is deleted in temperature_expose
 			item.fire_act(null, temperature, volume)
 	return 0
 
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 0d5e80fe7f1..3b046e73261 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -205,7 +205,7 @@ datum/controller/game_controller/proc/process()
 
 				var/end_time = world.timeofday
 				if(end_time < start_time)
-					start_time -= 864000    //deciseconds in a day
+					start_time -= MIDNIGHT_ROLLOVER    //deciseconds in a day
 				sleep( round(minimum_ticks - (end_time - start_time),1) )
 			else
 				sleep(10)
diff --git a/maps/tgstation.2.1.2.dmm b/maps/tgstation.2.1.2.dmm
index 0e0be79cb1a..b03cd612bee 100644
--- a/maps/tgstation.2.1.2.dmm
+++ b/maps/tgstation.2.1.2.dmm
@@ -4948,7 +4948,7 @@
 "bRl" = (/obj/machinery/telecomms/bus/preset_three,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server)
 "bRm" = (/obj/machinery/telecomms/server/presets/command,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server)
 "bRn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/computer)
-"bRo" = (/obj/machinery/computer/telecomms/traffic{network = list("tcommsat")},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer)
+"bRo" = (/obj/machinery/computer/telecomms/traffic{network = "tcommsat"},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer)
 "bRp" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor,/area/tcommsat/computer)
 "bRq" = (/obj/effect/gibspawner/human,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned)
 "bRr" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/simulated/floor,/area/tcommsat/computer)
@@ -4995,7 +4995,7 @@
 "bSg" = (/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server)
 "bSh" = (/obj/machinery/telecomms/broadcaster/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server)
 "bSi" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server)
-"bSj" = (/obj/machinery/computer/telecomms/server{network = list("tcommsat")},/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/tcommsat/computer)
+"bSj" = (/obj/machinery/computer/telecomms/server{network = "tcommsat"},/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/tcommsat/computer)
 "bSk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/tcommsat/computer)
 "bSl" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/airless{icon_state = "damaged4"},/area/mine/abandoned)
 "bSm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/folder/blue,/obj/item/weapon/pen/blue,/turf/simulated/floor,/area/tcommsat/computer)
@@ -5173,7 +5173,7 @@
 "bVC" = (/obj/machinery/telecomms/bus/preset_two,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server)
 "bVD" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server)
 "bVE" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/server)
-"bVF" = (/obj/machinery/computer/telecomms/monitor{network = list("tcommsat")},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer)
+"bVF" = (/obj/machinery/computer/telecomms/monitor{network = "tcommsat"},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/tcommsat/computer)
 "bVG" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor,/area/tcommsat/computer)
 "bVH" = (/obj/item/stack/rods,/obj/structure/door_assembly/door_assembly_ext{name = "Broken External Airlock"},/turf/simulated/floor/airless,/area/mine/abandoned)
 "bVI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/mine/abandoned)