diff --git a/CHANGELOG b/CHANGELOG
index 01045b2..d2b7d1a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,7 @@ Ground Zero 2.09 to 2.10
   a player standing on a blocked elevator gets turned around (by
   skuller).
 - Fix several coop related bugs with the powercubes. (by BjossiAlfreds)
-- A way better fix for dead bodys obstructing elevators or falling
+- A way better fix for dead bodies obstructing elevators or falling
   through the worldmodel. (by BjossiAlfreds)
 - Fix items already in water playing a splash sound at level start. (by
   BjossiAlfreds)
diff --git a/Makefile b/Makefile
index a850dbe..e44acdc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@
 #                                                       #
 # Dependencies:                                         #
 # - None, but you need a Quake II to play.              #
-#   While in theorie every client should work           #
-#   Yamagi Quake II ist recommended.                    #
+#   While in theory every client should work            #
+#   Yamagi Quake II is recommended.                     #
 #                                                       #
 # Platforms:                                            #
 # - FreeBSD                                             #
@@ -286,7 +286,7 @@ ROGUE_OBJS_ = \
 
 # ----------
 
-# Rewrite pathes to our object directory
+# Rewrite paths to our object directory
 ROGUE_OBJS = $(patsubst %,build/%,$(ROGUE_OBJS_))
 
 # ----------
diff --git a/src/g_misc.c b/src/g_misc.c
index 1ece7aa..ea64ead 100644
--- a/src/g_misc.c
+++ b/src/g_misc.c
@@ -697,7 +697,7 @@ SP_info_null(edict_t *self)
 /*
  * QUAKED info_notnull (0 0.5 0) (-4 -4 -4) (4 4 4)
  *
- * Used as a positional target for lightning.
+ * Used as a positional target for lighting.
  */
 void
 SP_info_notnull(edict_t *self)
diff --git a/src/player/weapon.c b/src/player/weapon.c
index 6e9820f..5aec3e6 100644
--- a/src/player/weapon.c
+++ b/src/player/weapon.c
@@ -691,7 +691,9 @@ Weapon_Generic(edict_t *ent, int FRAME_ACTIVATE_LAST, int FRAME_FIRE_LAST, int F
 		int FRAME_DEACTIVATE_LAST, int *pause_frames, int *fire_frames, void (*fire)(edict_t *ent))
 {
 	int n;
-	const unsigned short int change_speed = (g_swap_speed->value > 0)?(unsigned short int)g_swap_speed->value:1;
+	const unsigned short int change_speed = (g_swap_speed->value > 1)?
+		(g_swap_speed->value < USHRT_MAX)? (unsigned short int)g_swap_speed->value : 1
+		: 1;
 
 	if (!ent || !fire)
 	{