diff --git a/shooter/api.lua b/shooter/api.lua
index ac0f034..1d45a15 100644
--- a/shooter/api.lua
+++ b/shooter/api.lua
@@ -260,8 +260,8 @@ local function fire_weapon(player, itemstack, spec, extended)
 	end
 	pos.y = pos.y + config.camera_height
 	spec.origin = vector.add(pos, dir)
-	shots[spec.user] = minetest.get_us_time() / 1000000 +
-		spec.tool_caps.full_punch_interval
+	local interval = spec.tool_caps.full_punch_interval
+	shots[spec.user] = minetest.get_us_time() / 1000000 + interval
 	minetest.sound_play(spec.sound, {object=player})
 	if spec.bullet_image then
 		minetest.add_particle({
diff --git a/shooter_guns/init.lua b/shooter_guns/init.lua
index 304cea6..a26b656 100644
--- a/shooter_guns/init.lua
+++ b/shooter_guns/init.lua
@@ -139,8 +139,8 @@ if shooter.config.enable_crafting == true then
 end
 
 --Backwards compatibility
-minetest.register_alias("shooter:shotgun", "shooter_guns:shotgun")
-minetest.register_alias("shooter:pistol", "shooter_guns:pistol")
-minetest.register_alias("shooter:machine_gun", "shooter_guns:machine_gun")
-minetest.register_alias("shooter:rifle", "shooter_guns:rifle")
+minetest.register_alias("shooter:shotgun", "shooter_guns:shotgun_loaded")
+minetest.register_alias("shooter:pistol", "shooter_guns:pistol_loaded")
+minetest.register_alias("shooter:machine_gun", "shooter_guns:machine_gun_loaded")
+minetest.register_alias("shooter:rifle", "shooter_guns:rifle_loaded")
 minetest.register_alias("shooter:ammo", "shooter_guns:ammo")