diff --git a/baystation12.dme b/baystation12.dme
index 51ae3b450d4..c334963296d 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1522,6 +1522,29 @@
 #include "code\WorkInProgress\Chinsky\ashtray.dm"
 #include "code\WorkInProgress\Chinsky\guestpass.dm"
 #include "code\WorkInProgress\Cib\MedicalSideEffects.dm"
+#include "code\WorkInProgress\computer3\bios.dm"
+#include "code\WorkInProgress\computer3\buildandrepair.dm"
+#include "code\WorkInProgress\computer3\component.dm"
+#include "code\WorkInProgress\computer3\computer.dm"
+#include "code\WorkInProgress\computer3\computer3_notes.dm"
+#include "code\WorkInProgress\computer3\file.dm"
+#include "code\WorkInProgress\computer3\laptop.dm"
+#include "code\WorkInProgress\computer3\networking.dm"
+#include "code\WorkInProgress\computer3\NTOS.dm"
+#include "code\WorkInProgress\computer3\program.dm"
+#include "code\WorkInProgress\computer3\program_disks.dm"
+#include "code\WorkInProgress\computer3\server.dm"
+#include "code\WorkInProgress\computer3\storage.dm"
+#include "code\WorkInProgress\computer3\computers\arcade.dm"
+#include "code\WorkInProgress\computer3\computers\atmos_alert.dm"
+#include "code\WorkInProgress\computer3\computers\camera.dm"
+#include "code\WorkInProgress\computer3\computers\card.dm"
+#include "code\WorkInProgress\computer3\computers\communications.dm"
+#include "code\WorkInProgress\computer3\computers\crew.dm"
+#include "code\WorkInProgress\computer3\computers\HolodeckControl.dm"
+#include "code\WorkInProgress\computer3\computers\law.dm"
+#include "code\WorkInProgress\computer3\computers\medical.dm"
+#include "code\WorkInProgress\computer3\computers\security.dm"
 #include "code\WorkInProgress\kilakk\fax.dm"
 #include "code\WorkInProgress\Mini\atmos_control.dm"
 #include "code\WorkInProgress\pomf\spacepods\construction.dm"
diff --git a/code/WorkInProgress/computer3/buildandrepair.dm b/code/WorkInProgress/computer3/buildandrepair.dm
index 2cb9139f2e8..9240e0114ec 100644
--- a/code/WorkInProgress/computer3/buildandrepair.dm
+++ b/code/WorkInProgress/computer3/buildandrepair.dm
@@ -154,7 +154,7 @@
 					user << "\red There's already \an [battery] in [src]!"
 
 
-			if(istype(P, /obj/item/weapon/cable_coil))
+			if(istype(P, /obj/item/stack/cable_coil))
 				if(P:amount >= 5)
 					playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 					if(do_after(user, 20))
@@ -173,7 +173,7 @@
 				user << "\blue You remove the cables."
 				src.state = 2
 				src.icon_state = "2"
-				var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc )
+				var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
 				A.amount = 5
 
 			if(istype(P, /obj/item/weapon/crowbar)) // complicated check
diff --git a/code/WorkInProgress/computer3/computers/camera.dm b/code/WorkInProgress/computer3/computers/camera.dm
index 17e639166d5..d5f1218151c 100644
--- a/code/WorkInProgress/computer3/computers/camera.dm
+++ b/code/WorkInProgress/computer3/computers/camera.dm
@@ -142,7 +142,7 @@
 			return null
 
 		var/list/L = list()
-		for(var/obj/machinery/camera/C in cameranet.cameras)
+		for(var/obj/machinery/camera/C in cameranet.viewpoints)
 			var/list/temp = C.network & key.networks
 			if(temp.len)
 				L.Add(C)