diff --git a/xwords4/common/server.c b/xwords4/common/server.c
index a4325910c..06116c38f 100644
--- a/xwords4/common/server.c
+++ b/xwords4/common/server.c
@@ -737,7 +737,7 @@ makeRobotMove( ServerCtxt* server )
 
 #ifdef XWFEATURE_SLOW_ROBOT
 static XP_Bool 
-wakeRobotProc( void* closure, XWTimerReason why )
+wakeRobotProc( void* closure, XWTimerReason XP_UNUSED_DBG(why) )
 {
     XP_ASSERT( TIMER_SLOWROBOT == why );
     ServerCtxt* server = (ServerCtxt*)closure;
diff --git a/xwords4/linux/Makefile b/xwords4/linux/Makefile
index 81e4b3410..6f6f01f7a 100644
--- a/xwords4/linux/Makefile
+++ b/xwords4/linux/Makefile
@@ -18,13 +18,15 @@
 
 ifeq ($(MEMDEBUG),TRUE)
 DEFINES = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DNUMBER_KEY_AS_INDEX
-CFLAGS += -g $(GPROFFLAG) -Wall -Wunused-parameter -Wcast-align -Werror
+CFLAGS += -g $(GPROFFLAG) -Wall -Wunused-parameter -Wcast-align -Werror -O0
 CFLAGS += -DDEBUG_TS
 PLATFORM = obj_linux_memdbg
 else
 DEFINES =
 PLATFORM = obj_linux_rel
-CFLAGS += -Os -Werror -Wunused
+# Not shipping this!  Always build with symbols etc
+CFLAGS += -g $(GPROFFLAG) -Wall -Wunused-parameter -Wcast-align -Werror -O0
+#CFLAGS += -Os -Werror -Wunused
 endif
 
 # CC = llvm-gcc
diff --git a/xwords4/linux/linuxbt.c b/xwords4/linux/linuxbt.c
index 232c6e822..f0608eced 100644
--- a/xwords4/linux/linuxbt.c
+++ b/xwords4/linux/linuxbt.c
@@ -507,7 +507,7 @@ linux_bt_receive( int sock, XP_U8* buf, XP_U16 buflen )
 }
 
 void
-linux_bt_socketclosed( CommonGlobals* globals, int sock )
+linux_bt_socketclosed( CommonGlobals* globals, int XP_UNUSED_DBG(sock) )
 {
     LinBtStuff* btStuff = globals->btStuff;
     LOG_FUNC();
diff --git a/xwords4/linux/linuxdict.c b/xwords4/linux/linuxdict.c
index 876f1e424..4ed4ee719 100644
--- a/xwords4/linux/linuxdict.c
+++ b/xwords4/linux/linuxdict.c
@@ -93,7 +93,7 @@ countSpecials( LinuxDictionaryCtxt* ctxt )
 } /* countSpecials */
 
 static XP_Bitmap
-skipBitmap( LinuxDictionaryCtxt* ctxt, FILE* dictF )
+skipBitmap( LinuxDictionaryCtxt* XP_UNUSED_DBG(ctxt), FILE* dictF )
 {
     XP_U8 nCols, nRows, nBytes;
     LinuxBMStruct* lbs = NULL;
diff --git a/xwords4/linux/linuxutl.c b/xwords4/linux/linuxutl.c
index 07693aa8f..33d9632dd 100644
--- a/xwords4/linux/linuxutl.c
+++ b/xwords4/linux/linuxutl.c
@@ -54,7 +54,7 @@ linux_debugf( const char* format, ... )
 #endif
 
 static DictionaryCtxt*
-linux_util_makeEmptyDict( XW_UtilCtxt* uctx )
+linux_util_makeEmptyDict( XW_UtilCtxt* XP_UNUSED_DBG(uctx) )
 {
     XP_DEBUGF( "linux_util_makeEmptyDict called" );
     return linux_dictionary_make( MPPARM(uctx->mpool) NULL );