diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index 1adcdb42f7b..3ca7b264d8f 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -38,7 +38,7 @@ var/list/gaslist_cache = null
 	var/volume //liters
 	var/last_share
 	var/tmp/fuel_burnt
-	var/atom/holder
+	var/datum/holder
 
 /datum/gas_mixture/New(volume = CELL_VOLUME)
 	..()
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index 18fecd84249..826a519bc89 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -3,7 +3,7 @@
 	desc = "It measures something."
 	icon = 'icons/obj/meter.dmi'
 	icon_state = "meterX"
-	var/obj/machinery/atmospherics/pipe/target = null
+	var/atom/target = null
 	anchored = 1
 	power_channel = ENVIRON
 	var/frequency = 0