diff --git a/common/engine.c b/common/engine.c
index 5b73fecc4..b0e197c6b 100644
--- a/common/engine.c
+++ b/common/engine.c
@@ -78,8 +78,9 @@ struct EngineCtxt {
     Crosscheck rowChecks[MAX_ROWS]; // also used in xwscore
     XP_U16 scoreCache[MAX_ROWS];
 
+    XP_U16 nTilesMax;
 #ifdef XWFEATURE_SEARCHLIMIT
-    XP_U16 nTilesMin, nTilesMax;
+    XP_U16 nTilesMin;
     XP_U16 nTilesMinUser, nTilesMaxUser;
     XP_Bool tileLimitsKnown;
     BdHintLimits* searchLimits;
@@ -951,7 +952,11 @@ extendRight( EngineCtxt* engine, Tile* tiles, XP_U16 tileLength,
         return;
     }
  check_exit:
-    if ( accepting && tileLength >= engine->nTilesMin ) {
+    if ( accepting
+#ifdef XWFEATURE_SEARCHLIMIT
+         && tileLength >= engine->nTilesMin
+#endif
+         ) {
         considerMove( engine, tiles, tileLength, firstCol, col, row );
     }
 } /* extendRight */
diff --git a/common/server.c b/common/server.c
index 4437d6a4e..82957de82 100644
--- a/common/server.c
+++ b/common/server.c
@@ -590,9 +590,9 @@ makeRobotMove( ServerCtxt* server )
     XP_ASSERT( !!server_getEngineFor( server, turn ) );
     finished = engine_findMove( server_getEngineFor( server, turn ),
                                 model, model_getDictionary( model ), 
-                                tileSet->tiles, tileSet->nTiles, 0,
+                                tileSet->tiles, tileSet->nTiles,
 #ifdef XWFEATURE_SEARCHLIMIT
-                                NULL,
+                                NULL, XP_FALSE,
 #endif
                                 targetScore, &canMove, &newMove );
     if ( finished ) {
diff --git a/linux/cursesmain.c b/linux/cursesmain.c
index a7a4b0793..09543e264 100644
--- a/linux/cursesmain.c
+++ b/linux/cursesmain.c
@@ -329,7 +329,11 @@ static XP_Bool
 handleHint( CursesAppGlobals* globals )
 {
     XP_Bool redo;
-    globals->doDraw = board_requestHint( globals->cGlobals.game.board, 0, &redo );
+    globals->doDraw = board_requestHint( globals->cGlobals.game.board, 
+#ifdef XWFEATURE_SEARCHLIMIT
+                                         XP_FALSE,
+#endif
+                                         &redo );
     return XP_TRUE;
 } /* handleHint */