diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index ad26441bc..d40e98ac6 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -266,7 +266,7 @@ public class MainActivity extends Activity {
 					{
 						synchronized(textInput)
 						{
-							DemoRenderer.nativeTextInput( 13, 13 ); // send return
+							//DemoRenderer.nativeTextInput( 13, 13 ); // send return
 						}
 					}
 					return true;
@@ -275,8 +275,6 @@ public class MainActivity extends Activity {
 				{
 					synchronized(textInput) {
 						DemoRenderer.nativeTextInput( 8, 8 );
-						//textInput.addLast(8); // send backspace keycode
-						//textInput.addLast(8);
 					}
 					return false; // and proceed to delete text in keyboard input field
 				}
diff --git a/project/java/Settings.java b/project/java/Settings.java
index cac733d82..0137d9fea 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -357,7 +357,8 @@ class Settings
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(p);
 		builder.setTitle(p.getResources().getString(R.string.device_config));
-		builder.setSingleChoiceItems(items.toArray(new CharSequence[0]), MainMenuLastSelected, new DialogInterface.OnClickListener() 
+		//builder.setSingleChoiceItems(items.toArray(new CharSequence[0]), MainMenuLastSelected, new DialogInterface.OnClickListener() 
+		builder.setItems(items.toArray(new CharSequence[0]), new DialogInterface.OnClickListener()
 		{
 			public void onClick(DialogInterface dialog, int item)
 			{
@@ -465,7 +466,8 @@ class Settings
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(p);
 		builder.setTitle(p.getResources().getString(R.string.mouse_emulation));
-		builder.setSingleChoiceItems(items.toArray(new CharSequence[0]), MouseConfigMainMenuLastSelected, new DialogInterface.OnClickListener() 
+		//builder.setSingleChoiceItems(items.toArray(new CharSequence[0]), MouseConfigMainMenuLastSelected, new DialogInterface.OnClickListener() 
+		builder.setItems(items.toArray(new CharSequence[0]), new DialogInterface.OnClickListener()
 		{
 			public void onClick(DialogInterface dialog, int item) 
 			{
@@ -541,7 +543,8 @@ class Settings
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(p);
 		builder.setTitle(p.getResources().getString(R.string.controls_screenkb));
-		builder.setSingleChoiceItems(items.toArray(new CharSequence[0]), KeyboardConfigMainMenuLastSelected, new DialogInterface.OnClickListener() 
+		//builder.setSingleChoiceItems(items.toArray(new CharSequence[0]), KeyboardConfigMainMenuLastSelected, new DialogInterface.OnClickListener()
+		builder.setItems(items.toArray(new CharSequence[0]), new DialogInterface.OnClickListener() 
 		{
 			public void onClick(DialogInterface dialog, int item) 
 			{