diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf
index a9b8f7af1..0dc757a82 100644
--- a/lib/src/translator/DictionaryChi.gf
+++ b/lib/src/translator/DictionaryChi.gf
@@ -14943,7 +14943,7 @@ lin grandee_N = mkN "贵族" ;
 lin grandeur_N = mkN "庄严" ;
 lin grandfather_N = mkN "爷爷" | mkN "祖父" "位" ;
 lin grandiose_A = mkA "雄伟" ;
-lin grandmother_N = mkN "爷爷" | mkN "祖母" ;
+lin grandmother_N = mkN "奶奶" | mkN "祖母" ;
 lin grandpa_N = mkN "外公" | mkN "外祖父" | mkN "爷爷" | mkN "祖父" ; -- open-multilingual-wordnet
 lin grandparent_N = mkN "祖父母" ;
 lin grandson_N = mkN "孙子" ;
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TTS.java b/src/ui/android/src/org/grammaticalframework/ui/android/TTS.java
index a7a7ef12e..3e020f0af 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TTS.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TTS.java
@@ -35,9 +35,9 @@ public class TTS {
     		}
             */
 
-	    /* OR use separate entries for Cantonese and Mandarin  */ 
+	    /* Google Chinese speech input has a nonstandard code. In output, yue works for Chi in Google, but SVOX uses the standard zh-CN  */ 
 	    	if (language.equals("cmn-Hans-CN")) {
-	    		language = "yue";
+	    		language = "zh-CN";
 	    	}
 
 	        Locale locale = LocaleUtils.parseJavaLocale(language.replace('-', '_'),
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
index c21978802..0781e9397 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
@@ -29,6 +29,7 @@ public class Translator {
     	new Language("bg-BG", "Bulgarian", "AppBul", R.xml.cyrillic),
         new Language("ca-ES", "Catalan", "AppCat", R.xml.qwerty),
     	new Language("cmn-Hans-CN", "Chinese", "AppChi", R.xml.qwerty),
+	//    	new Language("zh-CN", "Chinese", "AppChi", R.xml.qwerty),
 	//    	new Language("yue", "Chinese (Cantonese)", "AppChi", R.xml.qwerty),
 	//    	new Language("cmn-Hans-CN", "Chinese (Mandarin)", "AppChi", R.xml.qwerty),
         new Language("nl-NL", "Dutch", "AppDut", R.xml.qwerty),