diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index a2792707f..d09571efb 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -72,7 +72,7 @@ public class BoardActivity extends Activity implements UtilCtxt {
         public void run() {
             m_timers[m_why] = null;
             m_jniThread.handle( JNICmd.CMD_TIMER_FIRED,
-                                    m_why, m_when, m_handle );
+                                m_why, m_when, m_handle );
         }
     } 
 
@@ -708,8 +708,7 @@ public class BoardActivity extends Activity implements UtilCtxt {
 
     public void notifyGameOver()
     {
-        m_jniThread.handle( JNIThread.JNICmd.CMD_POST_OVER, 
-                            R.string.finalscores_title );
+        m_jniThread.handle( JNIThread.JNICmd.CMD_POST_OVER );
     }
 
     public boolean warnIllegalWord( String[] words, int turn, boolean turnLost )
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
index a0528fa0b..7c2411c4f 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
@@ -12,6 +12,7 @@ import android.os.Message;
 import android.graphics.Paint;
 import android.graphics.Rect;
 
+import org.eehouse.android.xw4.R;
 import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole;
 
 public class JNIThread extends Thread {
@@ -302,14 +303,12 @@ public class JNIThread extends Thread {
                 boolean gameOver = XwJNI.server_getGameIsOver( m_jniGamePtr );
                 sendForDialog( ((Integer)args[0]).intValue(),
                                XwJNI.model_writeGameHistory( m_jniGamePtr, 
-                                                             gameOver )
-                               );
+                                                             gameOver ) );
                 break;
 
             case CMD_FINAL:
                 if ( XwJNI.server_getGameIsOver( m_jniGamePtr ) ) {
-                    String msg = XwJNI.server_writeFinalScores( m_jniGamePtr );
-                    sendForDialog( R.string.query_title, msg );
+                    handle( JNICmd.CMD_POST_OVER );
                 } else {
                     Message.obtain( m_handler, QUERY_ENDGAME ).sendToTarget();
                     draw = true;
@@ -321,7 +320,7 @@ public class JNIThread extends Thread {
                 break;
 
             case CMD_POST_OVER:
-                sendForDialog( ((Integer)args[0]).intValue(),
+                sendForDialog( R.string.finalscores_title,
                                XwJNI.server_writeFinalScores( m_jniGamePtr ) );
                 break;