diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 5898d5b3153..e6e006dba71 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -217,7 +217,7 @@
 
 	standard_weapon_hit_effects(I, user, effective_force, blocked, hit_zone)
 
-	if(I.damtype == BRUTE && prob(33)) // Added blood for whacking non-humans too
+	if(I.force >= 5 && I.damtype == BRUTE && prob(33)) // Added blood for whacking non-humans too
 		var/turf/simulated/location = get_turf(src)
 		if(istype(location)) location.add_blood_floor(src)
 
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 243c6331bd1..485d183e3ab 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -609,9 +609,6 @@
 	return 2
 
 /mob/living/silicon/robot/attackby(obj/item/W, mob/user)
-	if (istype(W, /obj/item/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do
-		return
-
 	if(opened) // Are they trying to insert something?
 		for(var/V in components)
 			var/datum/robot_component/C = components[V]
@@ -818,21 +815,21 @@
 			else
 				to_chat(user, span_filter_notice("[span_red("Access denied.")]"))
 
-	else if(istype(W, /obj/item/borg/upgrade/))
-		var/obj/item/borg/upgrade/U = W
+	else if(istype(W, /obj/item/borg/upgrade))
+		var/obj/item/borg/upgrade/upgrade = W
 		if(!opened)
 			to_chat(user, span_filter_notice("You must access the borgs internals!"))
-		else if(!module && U.require_module)
+		else if(!module && upgrade.require_module)
 			to_chat(user, span_filter_notice("The borg must choose a module before it can be upgraded!"))
 		else if(user == src && istype(W,/obj/item/borg/upgrade/utility/reset))
 			to_chat(user, span_warning("You are restricted from reseting your own module."))
-		else if(U.locked)
+		else if(upgrade.locked)
 			to_chat(user, span_filter_notice("The upgrade is locked and cannot be used yet!"))
 		else
-			if(U.action(user, src))
+			if(upgrade.action(user, src))
 				to_chat(user, span_filter_notice("You apply the upgrade to [src]!"))
 				user.drop_item()
-				U.loc = src
+				upgrade.forceMove(src)
 				hud_used.update_robot_modules_display()
 			else
 				to_chat(user, span_filter_notice("Upgrade error!"))