diff --git a/code/_helpers/atmospherics.dm b/code/_helpers/atmospherics.dm
index 1d050f4dea..45a3acc802 100644
--- a/code/_helpers/atmospherics.dm
+++ b/code/_helpers/atmospherics.dm
@@ -18,4 +18,9 @@
 /proc/GetGasDatum(gas_id)
 	if(!(gas_id in gas_data.gases))
 		return null
-	return gas_data.gases[gas_id]
+	var/list/all_gases = decls_repository.get_decls_of_subtype(/decl/xgm_gas)
+	for(var/decl/xgm_gas/gas in all_gases)
+		if(gas_id != gas.id)
+			continue
+		return gas
+	return null
diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm
index 85d4e71c49..9e83068f2f 100644
--- a/code/controllers/subsystems/supply.dm
+++ b/code/controllers/subsystems/supply.dm
@@ -404,7 +404,7 @@ SUBSYSTEM_DEF(supply)
 					if(!(item.type in export_counter))
 						export_counter[item.type] = 0
 					if(export_counter[item.type] < 30)
-					export_counter[item.type] += 1
+						export_counter[item.type] += 1
 				//SEND_SIGNAL(src, COMSIG_TRADE_BEACON, item)
 				qdel(item)
 				++export_count