diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 4345b30c3a78..8ad9a0e0464b 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -448,7 +448,10 @@ nsPresContext::SetImageAnimationMode(nsImageAnimation aMode)
   return NS_OK;
 }
 
-
+/* This function has now been depricated.  It is no longer necesary to
+ * hold on to presContext just to get a nsLookAndFeel.  nsLookAndFeel is
+ * now a service provided by ServiceManager.
+ */
 NS_IMETHODIMP
 nsPresContext::GetLookAndFeel(nsILookAndFeel** aLookAndFeel)
 {
diff --git a/layout/base/src/nsPresContext.cpp b/layout/base/src/nsPresContext.cpp
index 4345b30c3a78..8ad9a0e0464b 100644
--- a/layout/base/src/nsPresContext.cpp
+++ b/layout/base/src/nsPresContext.cpp
@@ -448,7 +448,10 @@ nsPresContext::SetImageAnimationMode(nsImageAnimation aMode)
   return NS_OK;
 }
 
-
+/* This function has now been depricated.  It is no longer necesary to
+ * hold on to presContext just to get a nsLookAndFeel.  nsLookAndFeel is
+ * now a service provided by ServiceManager.
+ */
 NS_IMETHODIMP
 nsPresContext::GetLookAndFeel(nsILookAndFeel** aLookAndFeel)
 {
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index 719d1b093190..94140fe9e336 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -1307,7 +1307,8 @@ nsTextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
         }
       }
       n -= contentLen;
-      NS_ASSERTION(n >= 0, "whoops");
+      if(n<0)
+        NS_WARNING("mContentLength is < FragmentLength");
     }
   }
 
diff --git a/layout/html/base/src/nsTextFrame.cpp b/layout/html/base/src/nsTextFrame.cpp
index 719d1b093190..94140fe9e336 100644
--- a/layout/html/base/src/nsTextFrame.cpp
+++ b/layout/html/base/src/nsTextFrame.cpp
@@ -1307,7 +1307,8 @@ nsTextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
         }
       }
       n -= contentLen;
-      NS_ASSERTION(n >= 0, "whoops");
+      if(n<0)
+        NS_WARNING("mContentLength is < FragmentLength");
     }
   }