diff --git a/src/ChangeLog b/src/ChangeLog
index bdd165f173..3702f31795 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2003-03-27  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
+	* lyxgluelength.h (isValidGlueLength): add default arg on
+	parameter 2. Remove default arg from friend in class.
+
+	* lyxlength.h (isValidLength): add default arg on parameter 2.
+	Remove default arg from friend in class.
+
 	* text2.C (LyXText): adjust, initialize refresh_row.
 	(init): adjust
 	(removeRow): adjust
diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 1b3528311e..6124fefb86 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-27  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* ControlDialog.tmpl (show): qualify emergency_exit_ with this->
+	(update): ditto
+	(hide): ditto
+
 2003-03-26  Angus Leeming  <leeming@lyx.org>
 
 	* ControlThesaurus.[Ch]: rewrite to use the Dialog-based scheme.
@@ -187,7 +193,7 @@
 	* ControlConnections.C: temporary renaming of Dialogs::signals.
 
 	* Makefile.am: add new files.
-	
+
 2003-02-21  Angus Leeming  <leeming@lyx.org>
 
 	* ControlBibtex.C (Browse):
@@ -198,7 +204,7 @@
 	browse, browsedir):
 	* ControlPrint.C (Browse):
 	don't pass a LyXView & to browseFile et al.
-	* helper_funcs.[Ch] (browseFile, browseRelFile, browseDir): 
+	* helper_funcs.[Ch] (browseFile, browseRelFile, browseDir):
 	don't pass a LyXView & to fileDlg.
 
 2003-02-17  John Levon  <levon@movementarian.org>
@@ -246,7 +252,7 @@
 2003-01-11  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
 	* helper_funcs.[Ch]: implement browseDir (browse directory) [bug 824]
-	
+
 	* ControlPrefs.[Ch]: implement browsedir for the use of use browseDir.
 
 2002-12-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
diff --git a/src/frontends/controllers/ControlDialog.tmpl b/src/frontends/controllers/ControlDialog.tmpl
index 8777673d71..7135ac56f2 100644
--- a/src/frontends/controllers/ControlDialog.tmpl
+++ b/src/frontends/controllers/ControlDialog.tmpl
@@ -38,7 +38,7 @@ void ControlDialog<Base>::show()
 	}
 
 	setParams();
-	if (emergency_exit_) {
+	if (this->emergency_exit_) {
 		hide();
 		return;
 	}
@@ -57,7 +57,7 @@ void ControlDialog<Base>::update()
 		return;
 
 	setParams();
-	if (emergency_exit_) {
+	if (this->emergency_exit_) {
 		hide();
 		return;
 	}
@@ -72,7 +72,7 @@ void ControlDialog<Base>::update()
 template <class Base>
 void ControlDialog<Base>::hide()
 {
-	emergency_exit_ = false;
+	this->emergency_exit_ = false;
 	clearParams();
 
 	disconnect();
diff --git a/src/lyxgluelength.h b/src/lyxgluelength.h
index 8cd08966e4..77c53ec0d3 100644
--- a/src/lyxgluelength.h
+++ b/src/lyxgluelength.h
@@ -48,11 +48,8 @@ public:
 	///
 	string const asLatexString() const;
 
-
-	/** If "data" is valid, the length represented by it is
-	  stored into "result", if that is not 0. */
 	friend bool isValidGlueLength(string const & data,
-				      LyXGlueLength* result = 0);
+				      LyXGlueLength* result);
 
 private:
 	/// the normal vlaue
@@ -67,7 +64,8 @@ private:
 bool operator==(LyXGlueLength const & l1, LyXGlueLength const & l2);
 ///
 bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2);
-///
-bool isValidGlueLength(string const & data, LyXGlueLength * result);
+/** If "data" is valid, the length represented by it is
+    stored into "result", if that is not 0. */
+bool isValidGlueLength(string const & data, LyXGlueLength * result = 0);
 
 #endif // LYXGLUELENGTH_H
diff --git a/src/lyxlength.h b/src/lyxlength.h
index fa1d1a1eb3..d64c93fbbc 100644
--- a/src/lyxlength.h
+++ b/src/lyxlength.h
@@ -70,9 +70,7 @@ public:
 	/// return the on-screen size of this length of an image
 	int inBP() const;
 
-	/** If "data" is valid, the length represented by it is
-	  stored into "result", if that is not 0. */
-	friend bool isValidLength(string const & data, LyXLength * result = 0);
+	friend bool isValidLength(string const & data, LyXLength * result);
 
 private:
 	///
@@ -85,8 +83,9 @@ private:
 bool operator==(LyXLength const & l1, LyXLength const & l2);
 ///
 bool operator!=(LyXLength const & l1, LyXLength const & l2);
-///
-bool isValidLength(string const & data, LyXLength * result);
+/** If "data" is valid, the length represented by it is
+    stored into "result", if that is not 0. */
+bool isValidLength(string const & data, LyXLength * result = 0);
 /// return the name of the given unit number
 char const * stringFromUnit(int unit);
 
diff --git a/src/text2.C b/src/text2.C
index b5a5689573..2f83d86797 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -2318,7 +2318,6 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
 				}
 				setHeightOfRow(refresh_row);
 			}
-
 		} else {
 			Row * nextrow = old_cursor.row()->next();
 			const_cast<LyXText *>(this)->postPaint(