diff --git a/ChangeLog b/ChangeLog
index fb7ef81bd1..ace18ffe36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+2000-05-31 Dekel Tsur  <dekel@math.tau.ac.il>
+
+	* src/lyxrc.C (read): Add a missing break in the switch
+
 2000-05-30 Dekel Tsur  <dekel@math.tau.ac.il>
 
+ 	* src/text2.C (InsertStringA): Fix a bug with insertion into table
+	
 	* src/trans_mgr.C (insertVerbatim): Do not use insetquote when the
 	text is Hebrew.
                              
diff --git a/src/lyxrc.C b/src/lyxrc.C
index 28a2bdb700..f34e0cdb64 100644
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -1017,6 +1017,7 @@ int LyXRC::read(string const & filename)
 		case RC_MARK_FOREIGN_LANGUAGE:
 			if (lexrc.next())
 				mark_foreign_language = lexrc.GetBool();
+			break;
 		case RC_SHOW_BANNER:
 			if (lexrc.next())
 				show_banner = lexrc.GetBool();
diff --git a/src/text2.C b/src/text2.C
index e0ed5616ba..adc5591656 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -2869,8 +2869,9 @@ void LyXText::InsertStringA(string const & str)
 			}
 		} else {
                         if (par->table) {
-                                if (i + 1 >= str.length()) {
-                                        ++pos;
+                                if ((i + 1) >= str.length()) {
+					if (pos < par->size())
+						++pos;
                                         break;
                                 }
                                 while((pos < par->size()) &&