diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index ff7821fa0af..40e04f09287 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -240,8 +240,6 @@ update_flag
 
 	nanomanager.update_uis(src) // Update all NanoUIs attached to src
 
-
-
 /obj/machinery/portable_atmospherics/canister/attack_ai(var/mob/user as mob)
 	return src.attack_hand(user)
 
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index 586ef375253..615bf173594 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -83,7 +83,7 @@
 /obj/machinery/portable_atmospherics/proc/update_connected_network()
 	if(!connected_port)
 		return
-	
+
 	var/datum/pipe_network/network = connected_port.return_network(src)
 	if (network)
 		network.update = 1
@@ -120,7 +120,7 @@
 				user << "\blue Nothing happens."
 				return
 
-	else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
+	else if ((istype(W, /obj/item/device/analyzer)) && Adjacent(user))
 		visible_message("\red [user] has used [W] on \icon[icon]")
 		if(air_contents)
 			var/pressure = air_contents.return_pressure()
@@ -153,25 +153,25 @@
 		if(cell)
 			user << "There is already a power cell installed."
 			return
-		
+
 		var/obj/item/weapon/cell/C = I
-		
+
 		user.drop_item()
 		C.add_fingerprint(user)
 		cell = C
 		C.loc = src
 		user.visible_message("\blue [user] opens the panel on [src] and inserts [C].", "\blue You open the panel on [src] and insert [C].")
 		return
-	
+
 	if(istype(I, /obj/item/weapon/screwdriver))
 		if(!cell)
 			user << "\red There is no power cell installed."
 			return
-		
+
 		user.visible_message("\blue [user] opens the panel on [src] and removes [cell].", "\blue You open the panel on [src] and remove [cell].")
 		cell.add_fingerprint(user)
 		cell.loc = src.loc
 		cell = null
 		return
-	
+
 	..()
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 28192bde39d..68ecbe0d876 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -31,6 +31,10 @@
 		if(1 to 4)	overlays += "phoron-[phorontanks]"
 		if(5 to INFINITY) overlays += "phoron-5"
 
+/obj/structure/dispenser/attack_ai(mob/user as mob)
+	if(user.Adjacent(src))
+		return attack_hand(user)
+	..()
 
 /obj/structure/dispenser/attack_hand(mob/user as mob)
 	user.set_machine(src)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 50806f0da2f..30b3824fb4b 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -88,7 +88,7 @@
 		//Pass the attack on to the target. This might delete/relocate wrapped.
 		target.attackby(wrapped,user)
 
-		//If wrapped did neither get deleted nor put into target, put it back into the gripper.
+		//If wrapped was neither deleted nor put into target, put it back into the gripper.
 		if(wrapped && user && (wrapped.loc == user))
 			wrapped.loc = src
 		else
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 37c7b5cf869..58460e1c6cd 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -30,7 +30,7 @@ var/global/list/rad_collectors = list()
 	//so that we don't zero out the meter if the SM is processed first.
 	last_power = last_power_new
 	last_power_new = 0
-	
+
 
 	if(P)
 		if(P.air_contents.gas["phoron"] == 0)
@@ -67,6 +67,7 @@ var/global/list/rad_collectors = list()
 		src.P = W
 		W.loc = src
 		update_icons()
+		return 1
 	else if(istype(W, /obj/item/weapon/crowbar))
 		if(P && !src.locked)
 			eject()
@@ -84,6 +85,7 @@ var/global/list/rad_collectors = list()
 			connect_to_network()
 		else
 			disconnect_from_network()
+		return 1
 	else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
 		if (src.allowed(user))
 			if(active)
@@ -94,10 +96,8 @@ var/global/list/rad_collectors = list()
 				user << "\red The controls can only be locked when the [src] is active"
 		else
 			user << "\red Access denied!"
-			return 1
-	else
-		..()
 		return 1
+	return ..()
 
 /obj/machinery/power/rad_collector/examine()
 	..()