diff --git a/src/mcts.cpp b/src/mcts.cpp
index a5626726..73f483ca 100644
--- a/src/mcts.cpp
+++ b/src/mcts.cpp
@@ -1515,7 +1515,7 @@ void SEARCHER::generate_and_score_moves(int depth, int alpha, int beta) {
                 if(*p < minp) minp = *p;
             }
             /*Minimize draws for low visits training*/
-            if(is_selfplay && !ply) {
+            if(!ply && chess_clock.max_visits < low_visits_threshold) {
                 int score = pstack->best_score;
                 for(int i = 0;i < pstack->count; i++) {
                     float* p = (float*)&pstack->score_st[i];
diff --git a/src/util.cpp b/src/util.cpp
index de14ef28..62a54947 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1187,10 +1187,10 @@ void CHESS_CLOCK::set_stime(int hply, bool output) {
     else p_time = int(0.7 * p_time);
     if(pondering) p_time /= 4;
 
-    if(move_no <= 35)
+    if(move_no <= 20)
         est_moves_left = 45 - move_no;
     else
-        est_moves_left = 10;
+        est_moves_left = 25;
 
     if(!mps) {
         moves_left = est_moves_left;