diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 0c2f3911438..8b22570203f 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -106,7 +106,7 @@ Class Procs:
 	var/active_power_usage = 0
 	var/power_channel = EQUIP
 		//EQUIP,ENVIRON or LIGHT
-	var/list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames.
+	var/list/component_parts = list() //list of all the parts used to build it, if made from certain kinds of frames.
 	var/uid
 	var/manual = 0
 	var/global/gl_uid = 1
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 645a928de0c..dc853fa08de 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -1234,7 +1234,7 @@ datum/design/gas_heater
 	req_tech = list("powerstorage" = 2, "engineering" = 1)
 	build_type = IMPRINTER
 	materials = list("$glass" = 2000, "sacid" = 20)
-	build_path = "/obj/item/weapon/circuitboard/gas_heater"
+	build_path = "/obj/item/weapon/circuitboard/unary_atmos/heater"
 
 datum/design/gas_cooler
 	name = "Gas Cooling System Board"
@@ -1243,7 +1243,7 @@ datum/design/gas_cooler
 	req_tech = list("magnets" = 2, "engineering" = 2)
 	build_type = IMPRINTER
 	materials = list("$glass" = 2000, "sacid" = 20)
-	build_path = "/obj/item/weapon/circuitboard/gas_cooler"
+	build_path = "/obj/item/weapon/circuitboard/unary_atmos/cooler"
 
 /////////////////////////////////////////
 ////////////Power Stuff//////////////////