diff --git a/ole/nls/grc.nls b/ole/nls/grc.nls
index 9186421..31977e9 100644
--- a/ole/nls/grc.nls
+++ b/ole/nls/grc.nls
@@ -1,7 +1,7 @@
 /*
  *	OLE2NLS library
  *      Greek
- *	(Greek strings in iso-8859-7)
+ *	(Greek strings in cp1253)
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"0408")
diff --git a/ole/nls/sky.nls b/ole/nls/sky.nls
index 02c7369..b027952 100644
--- a/ole/nls/sky.nls
+++ b/ole/nls/sky.nls
@@ -1,7 +1,7 @@
 /*
  *	OLE2NLS library
  *      Slovakia
- *	(Slovakian strings in iso-8859-2)
+ *	(Slovakian strings in cp1250)
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"041b")
diff --git a/ole/nls/tha.nls b/ole/nls/tha.nls
index 37f9652..f49cb98 100644
--- a/ole/nls/tha.nls
+++ b/ole/nls/tha.nls
@@ -103,8 +103,8 @@
 LOCVAL(LOCALE_INEGSYMPRECEDES, "1")
 LOCVAL(LOCALE_INEGSEPBYSPACE, "0")
 LOCVAL(LOCALE_FONTSIGNATURE, "")
-LOCVAL(LOCALE_SISO639LANGNAME, """")
-LOCVAL(LOCALE_SISO3166CTRYNAME, """")
+LOCVAL(LOCALE_SISO639LANGNAME, "th")
+LOCVAL(LOCALE_SISO3166CTRYNAME, "TH")
 /*LOCVAL(LOCALE_IDEFAULTEBCDICCODEPAGE, """")*/
 /*LOCVAL(LOCALE_IPAPERSIZE, """")*/
 /*LOCVAL(LOCALE_SENGCURRNAME, """")*/
diff --git a/ole/nls/trk.nls b/ole/nls/trk.nls
index 58478b1..a30b064 100644
--- a/ole/nls/trk.nls
+++ b/ole/nls/trk.nls
@@ -1,7 +1,7 @@
 /*
  *	OLE2NLS library
  *      Turkey
- *	(Turkish strings in iso-8859-9)
+ *	(Turkish strings in cp1254)
  */
 
 LOCVAL(LOCALE_ILANGUAGE,"041f")
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index 08238fd..b25cad2 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -683,7 +683,7 @@
 	}
 
     found=0;lang=lcid;
-    for (i=0;i<3;i++) {
+    for (i=0;(i<3 && !found);i++) {
       int j;
 
       for (j=0;j<sizeof(langlocales)/sizeof(langlocales[0]);j++) {
@@ -708,8 +708,8 @@
     }
 
     if(!found) {
-      ERR(ole,"'%s' not supported for your language (%4X).\n",
-			retString,lang);
+      ERR(ole,"'%s' not supported for your language (%04X).\n",
+			retString,lcid);
 		SetLastError(ERROR_INVALID_PARAMETER);
 		return 0;			
 	}