diff --git a/code/modules/computer3/lapvend.dm b/code/modules/computer3/lapvend.dm
index 0eb665f70b2..e77298dc35e 100644
--- a/code/modules/computer3/lapvend.dm
+++ b/code/modules/computer3/lapvend.dm
@@ -61,7 +61,15 @@
 		..()
 
 
-/obj/machinery/lapvend/attack_hand(mob/user as mob)
+/obj/machinery/lapvend/attack_hand(mob/user)
+	if(..())
+		return 1
+	interact(user)
+	
+/obj/machinery/lapvend/attack_ghost(mob/user)
+	interact(user)
+	
+/obj/machinery/lapvend/interact(mob/user)
 	user.set_machine(src)
 	var/vendorname = (src.name)  //import the machine's name
 	var/dat = "<TT><center><b>[vendorname]</b></center><hr /><br>" //display the name, and added a horizontal rule
@@ -133,8 +141,10 @@
 
 
 /obj/machinery/lapvend/Topic(href, href_list)
-	if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
-		usr.set_machine(src)
+	if(..())
+		return 1
+		
+	usr.set_machine(src)
 	switch(href_list["choice"])
 		if("single_add")
 			cardreader = 1
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index d84e434456d..03f39868bbc 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -657,6 +657,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return TRUE
 
 	return FALSE
+	
+/mob/dead/observer/incapacitated()
+	return TRUE
 
 //this is a mob verb instead of atom for performance reasons
 //see /mob/verb/examinate() in mob.dm for more info