diff --git a/archive/maps/old_yw/yw/cryogaia_things.dm b/archive/maps/old_yw/yw/cryogaia_things.dm
index 2162ad42a2..30936cba9f 100644
--- a/archive/maps/old_yw/yw/cryogaia_things.dm
+++ b/archive/maps/old_yw/yw/cryogaia_things.dm
@@ -386,7 +386,7 @@ var/global/list/latejoin_tram   = list()
 			if(welder.remove_fuel(0,user) && welder && welder.isOn())
 				to_chat(user, span_notice("You start to melt the ice off \the [src]"))
 				playsound(src, welder.usesound, 50, 1)
-				if(do_after(user, welderTime SECONDS))
+				if(do_after(user, welderTime SECONDS, src))
 					to_chat(user, span_notice("You finish melting the ice off \the [src]"))
 					unFreeze()
 					return
@@ -410,7 +410,7 @@ var/global/list/latejoin_tram   = list()
 
 /obj/machinery/door/airlock/glass_external/freezable/proc/handleRemoveIce(obj/item/W as obj, mob/user as mob, var/time = 15 as num)
 	to_chat(user, span_notice("You start to chip at the ice covering \the [src]"))
-	if(do_after(user, text2num(time SECONDS)))
+	if(do_after(user, text2num(time SECONDS), src))
 		unFreeze()
 		to_chat(user, span_notice("You finish chipping the ice off \the [src]"))
 
diff --git a/code/modules/projectiles/guns/projectile_ch.dm b/code/modules/projectiles/guns/projectile_ch.dm
index 5637035eec..dcd4b228ed 100644
--- a/code/modules/projectiles/guns/projectile_ch.dm
+++ b/code/modules/projectiles/guns/projectile_ch.dm
@@ -68,7 +68,7 @@
 
 /obj/item/gun/projectile/attack_self(mob/user as mob)
 	if(manual_chamber)
-		if(do_after(user,4))
+		if(do_after(user, 0.4 SECONDS, src))
 			bolt_handle(user)
 	else if(firemodes.len > 1)
 		switch_firemodes(user)
@@ -322,14 +322,14 @@
 				if(!CHECK_BITFIELD(auto_loading_type,OPEN_BOLT))
 					if(!chambered)
 						if(bolt_open)
-							if(do_after(user,5))
+							if(do_after(user, 0.5 SECONDS, src))
 								user.visible_message(span_notice("[user] slides \the [C] into the [src]'s chamber."),span_notice("You slide \the [C] into the [src]'s chamber."))
 								chambered = C
 								user.hud_used.update_ammo_hud(user, src)
 							else
 								return
 						else if(!(CHECK_BITFIELD(auto_loading_type,LOCK_OPEN_EMPTY) || (CHECK_BITFIELD(auto_loading_type,LOCK_MANUAL_LOCK))))
-							if(do_after(user,15))
+							if(do_after(user, 1.5 SECONDS, src))
 								user.visible_message(span_notice("[user] holds open \the [src]'s [bolt_name] and slides [C] into the chamber before letting the bolt close again."),span_notice("You slide \the [C] into the [src]'s chamber."))
 
 								chambered = C