diff --git a/code/modules/modular_computers/file_system/programs/_program.dm b/code/modules/modular_computers/file_system/programs/_program.dm
index 7b7b78e1c98..1249f79036d 100644
--- a/code/modules/modular_computers/file_system/programs/_program.dm
+++ b/code/modules/modular_computers/file_system/programs/_program.dm
@@ -7,6 +7,9 @@
 /obj/item/modular_computer/update_layout()
 	return TRUE
 
+/datum/computer_file/program/update_layout()
+	return TRUE
+
 /datum/nano_module/program
 	available_to_ai = FALSE
 	var/datum/computer_file/program/program	// Program-Based computer program that runs this nano module. Defaults to null.
diff --git a/code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm b/code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm
index 902ae6d660e..de2edc5301b 100644
--- a/code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm
+++ b/code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm
@@ -109,7 +109,7 @@
 
 /datum/nano_module/program/civilian/cargocontrol/Topic(href, href_list)
 	var/datum/shuttle/autodock/ferry/supply/shuttle = SScargo.shuttle
-	var/obj/item/modular_computer/console = host
+	var/obj/item/modular_computer/console = program.computer
 	if (!shuttle)
 		log_debug("## ERROR: Eek. The supply/shuttle datum is missing somehow.")
 		return
diff --git a/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm b/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm
index 2f2eab2c797..b64add4d8de 100644
--- a/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm
+++ b/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm
@@ -61,11 +61,11 @@
 
 	if(href_list["initialize"])
 		pistons = list()
-		for(var/obj/machinery/crusher_base/pstn in orange(10, src.host))
+		for(var/obj/machinery/crusher_base/pstn in orange(10, src.ui_host()))
 			pistons += pstn
 
 		airlocks = list()
-		for(var/obj/machinery/door/airlock/arlk in orange(10, src.host))
+		for(var/obj/machinery/door/airlock/arlk in orange(10, src.ui_host()))
 			if(arlk.id_tag != "crusher")
 				continue
 			airlocks += arlk
diff --git a/html/changelogs/dasfdgrgreg.yml b/html/changelogs/dasfdgrgreg.yml
new file mode 100644
index 00000000000..728d5faf8bc
--- /dev/null
+++ b/html/changelogs/dasfdgrgreg.yml
@@ -0,0 +1,4 @@
+author: Karolis2011
+delete-after: True
+changes: 
+  - bugfix: "Cargo control and crusher control programs now will properly work."