diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
index 358405ca7..80ba57421 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
@@ -566,8 +566,8 @@ public class BoardCanvas extends Canvas implements DrawCtx {
     public void score_pendingScore( Rect rect, int score, int playerNum,
                                     boolean curTurn, int flags )
     {
-        Log.d( TAG, "pendingScore(playerNum=%d, curTurn=%b)",
-               playerNum, curTurn );
+        // Log.d( TAG, "score_pendingScore(playerNum=%d, curTurn=%b)",
+        //        playerNum, curTurn );
 
         int otherIndx = (0 == (flags & CELL_ISCURSOR))
             ? CommonPrefs.COLOR_BACKGRND : CommonPrefs.COLOR_FOCUS;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
index 9093af279..7d68a4926 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
@@ -699,8 +699,8 @@ public class MQTTUtils extends Thread
     @Override
     public void onSuccess( IMqttToken asyncActionToken )
     {
-        Log.d( TAG, "%H.onSuccess(%s); cur state: %s", asyncActionToken,
-               this, mState );
+        Log.d( TAG, "%H.onSuccess(%s); cur state: %s", this, asyncActionToken,
+               mState );
         switch ( mState ) {
         case CONNECTING:
             setState( State.CONNECTED );
@@ -709,7 +709,7 @@ public class MQTTUtils extends Thread
             setState( State.SUBSCRIBED );
             break;
         default:
-            Log.e( TAG, "%H.onSuccess(): unexpected state %s", mState );
+            Log.e( TAG, "%H.onSuccess(): unexpected state %s", this, mState );
         }
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
index edd8b455a..6ebe193a1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
@@ -146,7 +146,7 @@ public class MultiMsgSink implements TransportProcs {
     @Override
     public void countChanged( int newCount )
     {
-        Log.d( TAG, "countChanged(new=%d); dropping", newCount );
+        // Log.d( TAG, "countChanged(new=%d); dropping", newCount );
     }
 
     public static boolean sendInvite( Context context, long rowid,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
index c1fbbfbce..1589a52c8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
@@ -93,8 +93,8 @@ public class Toolbar implements BoardContainer.SizeChangeListener {
         m_onClickListeners.put( index, new View.OnClickListener() {
                 @Override
                 public void onClick( View view ) {
-                    Log.i( TAG, "setListener(): click on %s with action %s",
-                           view.toString(), action.toString() );
+                    // Log.i( TAG, "setListener(): click on %s with action %s",
+                    //        view.toString(), action.toString() );
                     m_dlgDlgt.makeNotAgainBuilder( prefsKey, action, msgID )
                         .show();
                 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
index 2ffb284c7..8aa59b60a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
@@ -104,10 +104,10 @@ public class XwJNI {
             release();
         }
 
-        // @Override
+        @Override
         public void finalize() throws java.lang.Throwable
         {
-            if ( BuildConfig.DEBUG && (0 != m_refCount || 0 != m_ptrGame) ) {
+            if ( BuildConfig.NON_RELEASE && (0 != m_refCount || 0 != m_ptrGame) ) {
                 Log.e( TAG, "finalize(): called prematurely: refCount: %d"
                        + "; ptr: %d; creator: %s", m_refCount, m_ptrGame, mStack );
             }
@@ -309,6 +309,7 @@ public class XwJNI {
     private static GamePtr initGameJNI( long rowid )
     {
         long ptr = gameJNIInit( getJNI().m_ptrGlobals );
+        Assert.assertTrueNR( 0 != ptr ); // should be impossible
         GamePtr result = 0 == ptr ? null : new GamePtr( ptr, rowid );
         return result;
     }