diff --git a/xpfe/appshell/src/nsAppShellFactory.cpp b/xpfe/appshell/src/nsAppShellFactory.cpp
index 84b5fb00b028..e9ea96b30863 100644
--- a/xpfe/appshell/src/nsAppShellFactory.cpp
+++ b/xpfe/appshell/src/nsAppShellFactory.cpp
@@ -53,7 +53,8 @@ NSRegisterSelf(nsISupports* serviceMgr, const char *path)
 {
     nsComponentManager::RegisterComponent(kAppShellServiceCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
     nsComponentManager::RegisterComponent(kCmdLineServiceCID,  NULL, NULL, path, PR_TRUE, PR_TRUE);
-    nsComponentManager::RegisterComponent(kFileLocatorCID,  NULL, NULL, path, PR_TRUE, PR_TRUE);
+    nsComponentManager::RegisterComponent(kFileLocatorCID,
+                                         NULL, NS_FILELOCATOR_PROGID, path, PR_TRUE, PR_TRUE);
     nsComponentManager::RegisterComponent(kProtocolHelperCID,  NULL, NULL, path, PR_TRUE, PR_TRUE);
     nsComponentManager::RegisterComponent(kXPConnectFactoryCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
    	nsComponentManager::RegisterComponent(kNetSupportDialogCID, NULL, NULL, path, PR_TRUE, PR_TRUE);
diff --git a/xpfe/appshell/src/nsFileLocations.cpp b/xpfe/appshell/src/nsFileLocations.cpp
index d051efc9d2b8..f24b53adc817 100644
--- a/xpfe/appshell/src/nsFileLocations.cpp
+++ b/xpfe/appshell/src/nsFileLocations.cpp
@@ -427,7 +427,7 @@ NS_IMETHODIMP nsFileLocator::GetFileLocation(
            = (nsSpecialSystemDirectory::SystemDirectories)aType;
        return NS_OK;
    }
-   *(nsSpecialFileSpec*)outSpec = (nsSpecialFileSpec::Type)aType;
+   *(nsSpecialFileSpec*)&spec = (nsSpecialFileSpec::Type)aType;
    return NS_NewFileSpecWithSpec(spec, outSpec);
 }
 
diff --git a/xpfe/bootstrap/nsSetupRegistry.cpp b/xpfe/bootstrap/nsSetupRegistry.cpp
index 60c117b7250c..1d58fe5b021b 100644
--- a/xpfe/bootstrap/nsSetupRegistry.cpp
+++ b/xpfe/bootstrap/nsSetupRegistry.cpp
@@ -120,7 +120,7 @@ nsresult NS_AutoregisterComponents()
 extern "C" void
 NS_SetupRegistry_1()
 {
-  nsComponentManager::RegisterComponent(kFileLocatorCID,  NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE);
+  nsComponentManager::RegisterComponent(kFileLocatorCID,  NULL, NS_FILELOCATOR_PROGID, APPSHELL_DLL, PR_FALSE, PR_FALSE);
 
   // This *has* to happen after registration of nsIFileLocator as the call
   // required it.