diff --git a/xpfe/appshell/src/nsFileLocations.cpp b/xpfe/appshell/src/nsFileLocations.cpp
index 637af8fe5979..f6334f25c1de 100644
--- a/xpfe/appshell/src/nsFileLocations.cpp
+++ b/xpfe/appshell/src/nsFileLocations.cpp
@@ -372,7 +372,7 @@ static void GetProfileDefaultsFolder(nsFileSpec& outSpec)
     if (NS_SUCCEEDED(rv)) {
         nsFileSpec tmpdir; 
         tmpdir = cwd;
-        tmpdir += (const PRUnichar*) lc_name;
+        tmpdir += nsAutoString(NS_STATIC_CAST(const PRUnichar*, lc_name));
 
         if (tmpdir.Exists())
             cwd = tmpdir;
diff --git a/xpfe/appshell/src/nsWindowMediator.cpp b/xpfe/appshell/src/nsWindowMediator.cpp
index 0e8dc48d3e01..c5c2f656407a 100644
--- a/xpfe/appshell/src/nsWindowMediator.cpp
+++ b/xpfe/appshell/src/nsWindowMediator.cpp
@@ -139,7 +139,7 @@ void GetAttribute( nsIXULWindow* inWindow, const nsAutoString& inAttribute, nsAu
 	  {
 	  	nsCOMPtr<nsIDOMElement> webshellElement( do_QueryInterface(node));
   		if ( webshellElement.get() )
-  			webshellElement->GetAttribute(inAttribute.GetUnicode(), outValue );
+  			webshellElement->GetAttribute(inAttribute, outValue );
   	  }
   }
 }
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 9895e8693f71..5c54677905a6 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -915,7 +915,7 @@ NS_IMETHODIMP nsXULWindow::ContentShellAdded(nsIDocShellTreeItem* aContentShell,
   }
 
   if (!shellInfo) {
-    shellInfo = new nsContentShellInfo(aID, aPrimary, aContentShell);
+    shellInfo = new nsContentShellInfo(nsAutoString(aID), aPrimary, aContentShell);
     mContentShells.AppendElement((void*)shellInfo);
   }