diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
index fd48f3c06..83df2e390 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
@@ -375,7 +375,7 @@ public class DlgDelegate {
         Dialog dialog = new AlertDialog.Builder( m_activity )
             .setTitle( R.string.query_title )
             .setMessage( state.m_msg )
-            .setPositiveButton( R.string.button_ok, lstnr )
+            .setPositiveButton( state.m_posButton, lstnr )
             .setNegativeButton( R.string.button_cancel, lstnr )
             .create();
         
@@ -457,7 +457,7 @@ public class DlgDelegate {
     {
         int nDlgs = m_dlgStates.size();
         Assert.assertNotNull( state );
-        Assert.assertTrue( state == m_dlgStates.get( state.m_id ) );
+        // Assert.assertTrue( state == m_dlgStates.get( state.m_id ) );
         m_dlgStates.remove( state.m_id );
         DbgUtils.logf( "dropState: active dialogs now %d from %d ", 
                        m_dlgStates.size(), nDlgs );
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java
index 93cc5a99b..c4f14648f 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java
@@ -32,12 +32,12 @@ public class DlgState implements Parcelable {
 
     public DlgState( int id, String msg, int cbckID )
     {
-        this( id, msg, 0, cbckID, 0 );
+        this( id, msg, R.string.button_ok, cbckID, 0 );
     }
 
     public DlgState( int id, String msg, int cbckID, int prefsKey )
     {
-        this( id, msg, 0, cbckID, prefsKey );
+        this( id, msg, R.string.button_ok, cbckID, prefsKey );
     }
 
     public DlgState( int id, String msg, int posButton,