diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
index 40f17861..717701db 100644
--- a/code/qcommon/cmd.c
+++ b/code/qcommon/cmd.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "qcommon.h"
 
-#define	MAX_CMD_BUFFER	16384
+#define	MAX_CMD_BUFFER  128*1024
 #define	MAX_CMD_LINE	1024
 
 typedef struct {
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 7f79047a..60aee7b1 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -38,7 +38,7 @@ int demo_protocols[] =
 
 #define MIN_DEDICATED_COMHUNKMEGS 1
 #define MIN_COMHUNKMEGS		56
-#define DEF_COMHUNKMEGS		64
+#define DEF_COMHUNKMEGS 	128
 #define DEF_COMZONEMEGS		24
 #define DEF_COMHUNKMEGS_S	XSTRING(DEF_COMHUNKMEGS)
 #define DEF_COMZONEMEGS_S	XSTRING(DEF_COMZONEMEGS)
diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index 9321e9c7..bb036435 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -28,7 +28,7 @@ cvar_t		*cvar_vars = NULL;
 cvar_t		*cvar_cheats;
 int			cvar_modifiedFlags;
 
-#define	MAX_CVARS	1024
+#define	MAX_CVARS	2048
 cvar_t		cvar_indexes[MAX_CVARS];
 int			cvar_numIndexes;
 
diff --git a/code/renderer/tr_flares.c b/code/renderer/tr_flares.c
index e6a757c7..ff768bab 100644
--- a/code/renderer/tr_flares.c
+++ b/code/renderer/tr_flares.c
@@ -79,7 +79,7 @@ typedef struct flare_s {
 	vec3_t		color;
 } flare_t;
 
-#define		MAX_FLARES		128
+#define		MAX_FLARES		256
 
 flare_t		r_flareStructs[MAX_FLARES];
 flare_t		*r_activeFlares, *r_inactiveFlares;