diff --git a/source/cmd.c b/source/cmd.c
index fe228c3..bced550 100644
--- a/source/cmd.c
+++ b/source/cmd.c
@@ -310,9 +310,10 @@ Cmd_StuffCmds_f (void)
 		if (com_cmdline[i] == '+') {
 			i++;
 
-			for (j = i; ((com_cmdline[j] != '+')
-						 && (com_cmdline[j] != '-')
-						 && (com_cmdline[j] != 0)); j++);
+			for (j = i; !((com_cmdline[j] == '+')
+						  || (com_cmdline[j] == '-'
+						      && (j==0 || com_cmdline[j - 1] == ' '))
+						  || (com_cmdline[j] == 0)); j++);
 
 			c = com_cmdline[j];
 			com_cmdline[j] = 0;
diff --git a/source/gl_dyn_fires.c b/source/gl_dyn_fires.c
index e063ae8..ccfd164 100644
--- a/source/gl_dyn_fires.c
+++ b/source/gl_dyn_fires.c
@@ -29,6 +29,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
+
 #include "cmd.h"
 #include "console.h"
 #include "glquake.h"
diff --git a/source/pcx.c b/source/pcx.c
index 6749636..2b36fb7 100644
--- a/source/pcx.c
+++ b/source/pcx.c
@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include "cl_parse.h"
 #include "console.h"
diff --git a/source/sw_model_alias.c b/source/sw_model_alias.c
index 3d40e3b..64d683d 100644
--- a/source/sw_model_alias.c
+++ b/source/sw_model_alias.c
@@ -32,6 +32,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include "r_local.h"
 #include "sys.h"
diff --git a/source/tga.c b/source/tga.c
index ad7d788..befa5ec 100644
--- a/source/tga.c
+++ b/source/tga.c
@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include "qendian.h"
 #include "quakefs.h"