diff --git a/mods/ctf/ctf_classes/classes.lua b/mods/ctf/ctf_classes/classes.lua
index 05aaa6a..3c59811 100644
--- a/mods/ctf/ctf_classes/classes.lua
+++ b/mods/ctf/ctf_classes/classes.lua
@@ -157,12 +157,12 @@ ctf_classes.register("sniper", {
 ctf_classes.register("rocketeer", {
 	description = "Rocketeer",
 	pros = { ">Can craft/use rockets" },
-	cons = { "> -50% health points" },
+	cons = { "> -25% health points" },
 	color = "#fa0",
 	properties = {
 		-- Disallow rocketeers from capturing flags - they're intended to be support
 		can_capture = false,
-		max_hp = 10,
+		max_hp = 15,
 
 		initial_stuff = {
 			"shooter_rocket:rocket_gun_loaded",
diff --git a/mods/other/random_messages/init.lua b/mods/other/random_messages/init.lua
index 9048dd9..a6f9612 100644
--- a/mods/other/random_messages/init.lua
+++ b/mods/other/random_messages/init.lua
@@ -77,7 +77,7 @@ function random_messages.read_messages()
 		"Change your class in your base by right clicking the home flag or typing /class.",
 		"Medics cause troops within 10 metres to regenerate health faster.",
 		"Hitting your enemy does more damage than not hitting them.",
-		"Press right mouse button or double-tap the screen to activate scope while wielding a sniper rifle.",
+		"Press right mouse button or double-tap the screen to activate scope while wielding a sniper rifle or a rocket gun.",
 		"The 'Updates' tab in your inventory will show some of the latest updates to CTF",
 	}
 end
diff --git a/mods/pvp/shooter b/mods/pvp/shooter
index 0bf4ba1..378c2c2 160000
--- a/mods/pvp/shooter
+++ b/mods/pvp/shooter
@@ -1 +1 @@
-Subproject commit 0bf4ba121997ba1553f221dbd2bc2ef179b512c9
+Subproject commit 378c2c200ed5bd20675d6d6581d87510b45fd0d1
diff --git a/mods/pvp/shooter_tweaks/init.lua b/mods/pvp/shooter_tweaks/init.lua
index b4b9b8c..f689b23 100644
--- a/mods/pvp/shooter_tweaks/init.lua
+++ b/mods/pvp/shooter_tweaks/init.lua
@@ -243,21 +243,17 @@ minetest.register_on_dieplayer(function(player)
 end)
 
 
-minetest.registered_entities["shooter_rocket:rocket_entity"].on_step = function(self, dtime)
-	self.timer = self.timer + dtime
-	if self.timer > 0.2 then
-		local pos = self.object:get_pos()
-		local above = {x=pos.x, y=pos.y + 1, z=pos.z}
-		if minetest.get_node(pos).name ~= "air" then
-			if self.user then
-				local player = minetest.get_player_by_name(self.user)
-				if player then
-					shooter.blast(above, 4, 25, 8, player, { "fleshy", "rocket" })
-				end
+minetest.registered_entities["shooter_rocket:rocket_entity"].on_step = function(self)
+	local pos = self.object:get_pos()
+	local above = {x=pos.x, y=pos.y + 1, z=pos.z}
+	if minetest.get_node(pos).name ~= "air" then
+		if self.user then
+			local player = minetest.get_player_by_name(self.user)
+			if player then
+				shooter.blast(above, 4, 25, 8, player, { "fleshy", "rocket" })
 			end
-			self.object:remove()
 		end
-		self.timer = 0
+		self.object:remove()
 	end
 end