diff --git a/mozilla/editor/base/nsComposerCommands.cpp b/mozilla/editor/base/nsComposerCommands.cpp
index ee57e7c160b..21cbbfb12c2 100644
--- a/mozilla/editor/base/nsComposerCommands.cpp
+++ b/mozilla/editor/base/nsComposerCommands.cpp
@@ -103,6 +103,8 @@ nsBaseComposerCommand::SetCommandNodeState(const nsAReadableString & aCommandNam
 nsBaseStateUpdatingCommand::nsBaseStateUpdatingCommand(const char* aTagName)
 : nsBaseComposerCommand()
 , mTagName(aTagName)
+, mGotState(PR_FALSE)
+, mState(PR_FALSE)
 {
 }
 
diff --git a/mozilla/editor/base/nsComposerCommands.h b/mozilla/editor/base/nsComposerCommands.h
index a288e4d6d99..ed94829b5bb 100644
--- a/mozilla/editor/base/nsComposerCommands.h
+++ b/mozilla/editor/base/nsComposerCommands.h
@@ -94,7 +94,6 @@ protected:
 protected:
 
   const char* mTagName;
-  const char* mAttributeName;
   
   PRPackedBool  mGotState;    // do we know the state yet?
   PRPackedBool  mState;       // is this style "on" ?
diff --git a/mozilla/editor/base/nsHTMLEditorLog.cpp b/mozilla/editor/base/nsHTMLEditorLog.cpp
index c15926ff938..e364bf6b34a 100644
--- a/mozilla/editor/base/nsHTMLEditorLog.cpp
+++ b/mozilla/editor/base/nsHTMLEditorLog.cpp
@@ -82,7 +82,7 @@ nsHTMLEditorLog::SetInlineProperty(nsIAtom *aProperty, const nsAReadableString &
 }
 
 NS_IMETHODIMP
-nsHTMLEditorLog::SetParagraphFormat(const nsString& aParagraphFormat)
+nsHTMLEditorLog::SetParagraphFormat(const nsAString& aParagraphFormat)
 {
   nsAutoHTMLEditorLogLock logLock(this);
 
diff --git a/mozilla/editor/base/nsHTMLEditorLog.h b/mozilla/editor/base/nsHTMLEditorLog.h
index b37719356ff..9cff61fbe93 100644
--- a/mozilla/editor/base/nsHTMLEditorLog.h
+++ b/mozilla/editor/base/nsHTMLEditorLog.h
@@ -56,7 +56,7 @@ public:
   NS_IMETHOD SetInlineProperty(nsIAtom *aProperty, 
                             const nsAReadableString & aAttribute, 
                             const nsAReadableString & aValue);
-  NS_IMETHOD SetParagraphFormat(const nsString& aParagraphFormat);
+  NS_IMETHOD SetParagraphFormat(const nsAString& aParagraphFormat);
   NS_IMETHOD RemoveInlineProperty(nsIAtom *aProperty, const nsAReadableString& aAttribute);
   NS_IMETHOD DeleteSelection(nsIEditor::EDirection aAction);
   NS_IMETHOD InsertText(const nsAReadableString& aStringToInsert);
diff --git a/mozilla/editor/composer/src/nsComposerCommands.cpp b/mozilla/editor/composer/src/nsComposerCommands.cpp
index ee57e7c160b..21cbbfb12c2 100644
--- a/mozilla/editor/composer/src/nsComposerCommands.cpp
+++ b/mozilla/editor/composer/src/nsComposerCommands.cpp
@@ -103,6 +103,8 @@ nsBaseComposerCommand::SetCommandNodeState(const nsAReadableString & aCommandNam
 nsBaseStateUpdatingCommand::nsBaseStateUpdatingCommand(const char* aTagName)
 : nsBaseComposerCommand()
 , mTagName(aTagName)
+, mGotState(PR_FALSE)
+, mState(PR_FALSE)
 {
 }
 
diff --git a/mozilla/editor/composer/src/nsComposerCommands.h b/mozilla/editor/composer/src/nsComposerCommands.h
index a288e4d6d99..ed94829b5bb 100644
--- a/mozilla/editor/composer/src/nsComposerCommands.h
+++ b/mozilla/editor/composer/src/nsComposerCommands.h
@@ -94,7 +94,6 @@ protected:
 protected:
 
   const char* mTagName;
-  const char* mAttributeName;
   
   PRPackedBool  mGotState;    // do we know the state yet?
   PRPackedBool  mState;       // is this style "on" ?
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditorLog.cpp b/mozilla/editor/libeditor/html/nsHTMLEditorLog.cpp
index c15926ff938..e364bf6b34a 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditorLog.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditorLog.cpp
@@ -82,7 +82,7 @@ nsHTMLEditorLog::SetInlineProperty(nsIAtom *aProperty, const nsAReadableString &
 }
 
 NS_IMETHODIMP
-nsHTMLEditorLog::SetParagraphFormat(const nsString& aParagraphFormat)
+nsHTMLEditorLog::SetParagraphFormat(const nsAString& aParagraphFormat)
 {
   nsAutoHTMLEditorLogLock logLock(this);
 
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditorLog.h b/mozilla/editor/libeditor/html/nsHTMLEditorLog.h
index b37719356ff..9cff61fbe93 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditorLog.h
+++ b/mozilla/editor/libeditor/html/nsHTMLEditorLog.h
@@ -56,7 +56,7 @@ public:
   NS_IMETHOD SetInlineProperty(nsIAtom *aProperty, 
                             const nsAReadableString & aAttribute, 
                             const nsAReadableString & aValue);
-  NS_IMETHOD SetParagraphFormat(const nsString& aParagraphFormat);
+  NS_IMETHOD SetParagraphFormat(const nsAString& aParagraphFormat);
   NS_IMETHOD RemoveInlineProperty(nsIAtom *aProperty, const nsAReadableString& aAttribute);
   NS_IMETHOD DeleteSelection(nsIEditor::EDirection aAction);
   NS_IMETHOD InsertText(const nsAReadableString& aStringToInsert);