diff --git a/xwords4/common/game.c b/xwords4/common/game.c
index 3ddc9dc99..8d3491ca9 100644
--- a/xwords4/common/game.c
+++ b/xwords4/common/game.c
@@ -90,8 +90,7 @@ timerChangeListener( void* data, const XP_U32 gameID,
                      XP_S32 oldVal, XP_S32 newVal )
 {
     XWGame* game = (XWGame*)data;
-    const CurGameInfo* gi = game->util->gameInfo;
-    XP_ASSERT( gi->gameID == gameID );
+    XP_ASSERT( game->util->gameInfo->gameID == gameID );
     XP_LOGF( "%s(oldVal=%d, newVal=%d, id=%d)", __func__, oldVal, newVal, gameID );
     dutil_onDupTimerChanged( util_getDevUtilCtxt( game->util ),
                              gameID, oldVal, newVal );
diff --git a/xwords4/common/memstream.c b/xwords4/common/memstream.c
index d0eda7187..7977141ea 100644
--- a/xwords4/common/memstream.c
+++ b/xwords4/common/memstream.c
@@ -404,7 +404,7 @@ mem_stream_getHash( const XWStreamCtxt* p_sctx, XWStreamPos pos,
         --len;
     }
 
-    log_hex( ptr, len, __func__ );
+    LOG_HEX( ptr, len, __func__ );
 
     hash = augmentHash( 0, ptr, len );
     if ( 0 != bits ) {
@@ -415,7 +415,7 @@ mem_stream_getHash( const XWStreamCtxt* p_sctx, XWStreamPos pos,
             byt &= 1 << bits;
         }
         hash = augmentHash( hash, &byt, 1 );
-        log_hex( &byt, 1, __func__ );
+        LOG_HEX( &byt, 1, __func__ );
     }
     hash = finishHash( hash );
 
diff --git a/xwords4/common/server.c b/xwords4/common/server.c
index 8ac1c8e23..3127213dd 100644
--- a/xwords4/common/server.c
+++ b/xwords4/common/server.c
@@ -3493,8 +3493,6 @@ static XP_Bool
 commitMoveImpl( ServerCtxt* server, XP_U16 player, TrayTileSet* newTilesP,
                 XP_Bool forced )
 {
-    ModelCtxt* model = server->vol.model;
-    CurGameInfo* gi = server->vol.gi;
     XP_Bool inDupeMode = inDuplicateMode(server);
     XP_ASSERT( server->nv.currentTurn == player || inDupeMode );
     XP_S16 turn = player;
@@ -3505,7 +3503,9 @@ commitMoveImpl( ServerCtxt* server, XP_U16 player, TrayTileSet* newTilesP,
     }
 
 #ifdef DEBUG
+    CurGameInfo* gi = server->vol.gi;
     if ( LP_IS_ROBOT( &gi->players[turn] ) ) {
+        ModelCtxt* model = server->vol.model;
         XP_ASSERT( model_checkMoveLegal( model, turn, (XWStreamCtxt*)NULL,
                                          (WordNotifierInfo*)NULL ) );
     }