diff --git a/auxmos.dll b/auxmos.dll
index 234d2c4a1bc3..adf788e9107a 100644
Binary files a/auxmos.dll and b/auxmos.dll differ
diff --git a/auxmos.pdb b/auxmos.pdb
index 54041f771df1..0558cc65ee28 100644
Binary files a/auxmos.pdb and b/auxmos.pdb differ
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index 80c8da66222d..b79744be63d6 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -33,8 +33,8 @@
 
 	var/list/turfs = block(	locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]),
 							locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ]))
-	var/list/border = block(locate(max(bounds[MAP_MINX]-1, 1),			max(bounds[MAP_MINY]-1, 1),			 bounds[MAP_MINZ]),
-							locate(min(bounds[MAP_MAXX]+1, world.maxx),	min(bounds[MAP_MAXY]+1, world.maxy), bounds[MAP_MAXZ])) - turfs
+	var/list/border = block(locate(max(bounds[MAP_MINX]-2, 1),			max(bounds[MAP_MINY]-2, 1),			 bounds[MAP_MINZ]),
+							locate(min(bounds[MAP_MAXX]+2, world.maxx),	min(bounds[MAP_MAXY]+2, world.maxy), bounds[MAP_MAXZ]))
 	for(var/L in turfs)
 		var/turf/B = L
 		atoms += B
@@ -46,9 +46,9 @@
 				continue
 			if(istype(A, /obj/machinery/atmospherics))
 				atmos_machines += A
-	for(var/L in border)
-		var/turf/T = L
-		T.air_update_turf() //calculate adjacent turfs along the border to prevent runtimes
+	for(var/turf/T as anything in border)
+		T.blocks_air = initial(T.blocks_air)
+		T.ImmediateCalculateAdjacentTurfs()
 
 	SSmapping.reg_in_areas_in_z(areas)
 	SSatoms.InitializeAtoms(atoms)
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index d27a593f2811..7be40a61bbf8 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -71,7 +71,8 @@
 	var/datum/gas_mixture/env = new
 	env.copy_from(L.return_air())
 	var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1)
-	air_contents.merge(removed)
+	if(removed)
+		air_contents.merge(removed)
 	trunk_check()
 
 /obj/machinery/disposal/attackby(obj/item/I, mob/user, params)