diff --git a/code/WorkInProgress/computer3/computer.dm b/code/WorkInProgress/computer3/computer.dm
index 456bdf3d71..4939444ae5 100644
--- a/code/WorkInProgress/computer3/computer.dm
+++ b/code/WorkInProgress/computer3/computer.dm
@@ -131,8 +131,6 @@
 				for(var/typekey in spawn_files)
 					hdd.addfile(new typekey,1)
 
-		if(program)
-			program.execute(os)
 		update_icon()
 
 
diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm
index 52d996827b..e0156e874e 100644
--- a/code/WorkInProgress/computer3/laptop.dm
+++ b/code/WorkInProgress/computer3/laptop.dm
@@ -138,6 +138,9 @@
 			usr << "You can't reach it."
 			return
 
+		close_laptop(usr)
+
+	proc/close_laptop(mob/user = null)
 		if(istype(loc,/obj/item/device/laptop))
 			testing("Close closed computer")
 			return
@@ -146,7 +149,8 @@
 			return
 
 		if(stat&BROKEN)
-			usr << "\The [src] is broken!  You can't quite get it closed."
+			if(user)
+				user << "\The [src] is broken!  You can't quite get it closed."
 			return
 
 		if(!portable)
@@ -157,7 +161,8 @@
 			portable.loc = loc
 			loc = portable
 			stat |= MAINT
-			usr << "You close \the [src]."
+			if(user)
+				user << "You close \the [src]."
 
 	auto_use_power()
 		if(stat&MAINT)
diff --git a/code/WorkInProgress/computer3/lapvend.dm b/code/WorkInProgress/computer3/lapvend.dm
index b6f93f4702..36de9e4cfc 100644
--- a/code/WorkInProgress/computer3/lapvend.dm
+++ b/code/WorkInProgress/computer3/lapvend.dm
@@ -263,7 +263,7 @@
 		choose_progs(C)
 		vend()
 		popup.close()
-		newlap.close_computer()
+		newlap.close_laptop()
 		newlap = null
 		cardreader = 0
 		floppy = 0