diff --git a/DroidFishApp/src/main/cpp/stockfish/evaluate.cpp b/DroidFishApp/src/main/cpp/stockfish/evaluate.cpp
index 8bb42ce..8fec62f 100644
--- a/DroidFishApp/src/main/cpp/stockfish/evaluate.cpp
+++ b/DroidFishApp/src/main/cpp/stockfish/evaluate.cpp
@@ -115,6 +115,8 @@ namespace Eval {
                     currentEvalFileName = eval_file;
             }
         }
+    if (currentEvalFileName != eval_file)
+        currentEvalFileName = "";
   }
 
   /// NNUE::verify() verifies that the last net used was loaded successfully
diff --git a/DroidFishApp/src/main/cpp/stockfish/syzygy/tbprobe.cpp b/DroidFishApp/src/main/cpp/stockfish/syzygy/tbprobe.cpp
index a131524..1c41f54 100644
--- a/DroidFishApp/src/main/cpp/stockfish/syzygy/tbprobe.cpp
+++ b/DroidFishApp/src/main/cpp/stockfish/syzygy/tbprobe.cpp
@@ -472,6 +472,8 @@ TBTables TBTables;
 // If the corresponding file exists two new objects TBTable<WDL> and TBTable<DTZ>
 // are created and added to the lists and hash table. Called at init time.
 void TBTables::add(const std::vector<PieceType>& pieces) {
+    if (sizeof(char*) < 8 && pieces.size() >= 6)
+        return; // Not enough address space to support 6-men TB on 32-bit OS
 
     std::string code;