diff --git a/xwords4/common/board.c b/xwords4/common/board.c
index 176843944..dafce9e89 100644
--- a/xwords4/common/board.c
+++ b/xwords4/common/board.c
@@ -256,7 +256,7 @@ board_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model,
         arrow->vert = (XP_Bool)stream_getBits( stream, 1 );
         arrow->visible = (XP_Bool)stream_getBits( stream, 1 );
 
-        if ( STREAM_VERS_MULTIADDR > version ) {
+        if ( STREAM_VERS_MODELDIVIDER > version ) {
             (void)stream_getBits( stream, NTILES_NBITS );
         }
         pti->traySelBits = (TileBit)stream_getBits( stream, 
@@ -2022,7 +2022,9 @@ board_requestHint( BoardCtxt* board,
         const Tile* tiles;
         XP_Bool searchComplete = XP_TRUE;
         const XP_U16 selPlayer = board->selPlayer;
+#ifdef XWFEATURE_SEARCHLIMIT
         PerTurnInfo* pti = board->selInfo;
+#endif
         EngineCtxt* engine = server_getEngineFor( board->server, selPlayer );
         const TrayTileSet* tileSet;
         ModelCtxt* model = board->model;
diff --git a/xwords4/common/comtypes.h b/xwords4/common/comtypes.h
index dc0abf2d3..5f67d101c 100644
--- a/xwords4/common/comtypes.h
+++ b/xwords4/common/comtypes.h
@@ -47,6 +47,7 @@
 #endif
 #define MAX_COLS MAX_ROWS
 
+#define STREAM_VERS_MODELDIVIDER 0x17
 #define STREAM_VERS_COMMSBACKOFF 0x16
 #define STREAM_VERS_DICTNAME 0x15
 #ifdef HASH_STREAM 
@@ -84,7 +85,7 @@
 #define STREAM_VERS_405  0x01
 
 /* search for FIX_NEXT_VERSION_CHANGE next time this is changed */
-#define CUR_STREAM_VERS STREAM_VERS_COMMSBACKOFF
+#define CUR_STREAM_VERS STREAM_VERS_MODELDIVIDER
 
 typedef struct XP_Rect {
     XP_S16 left;
diff --git a/xwords4/common/model.c b/xwords4/common/model.c
index 493f08346..74b2958be 100644
--- a/xwords4/common/model.c
+++ b/xwords4/common/model.c
@@ -2460,7 +2460,7 @@ loadPlayerCtxt( const ModelCtxt* model, XWStreamCtxt* stream, XP_U16 version,
         XP_ASSERT( 0 == pc->nUndone );
     }
     XP_ASSERT( 0 == pc->dividerLoc );
-    if ( STREAM_VERS_MULTIADDR <= version ) {
+    if ( STREAM_VERS_MODELDIVIDER <= version ) {
         pc->dividerLoc = stream_getBits( stream, NTILES_NBITS );
     }