diff --git a/cs-code/Makefile.am b/cs-code/Makefile.am
index aab34d586..4a29c7766 100644
--- a/cs-code/Makefile.am
+++ b/cs-code/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS= foreign
 pkgdatadir=@sharepath@/id1
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
-QCFLAGS=-g
+QCFLAGS=-g -Werror
 QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
 
 pkgdata_DATA= menu.dat
diff --git a/cs-code/options.qc b/cs-code/options.qc
index 1212d3ff8..3922c51c4 100644
--- a/cs-code/options.qc
+++ b/cs-code/options.qc
@@ -259,7 +259,7 @@ void () options_controls_menu =
 integer () options_features_draw = 
 {
 	local string tmp;
-	local integer cursor_pad = 0, spacing = 120, bar_pad;
+	local integer cursor_pad = 0, spacing = 120;
 
 
 	Draw_Pic		(16, 4, "gfx/qplaque.lmp");
@@ -296,7 +296,6 @@ integer (integer key, integer unicode, integer down) options_keyevent =
 
 void () options_menu =
 {
-	local string tmp;
 	local integer spacing = 120;
 
 	Menu_Begin (54, 72, "");