diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in
index 91071ed3d19..f5266e8a662 100644
--- a/mozilla/xpfe/components/Makefile.in
+++ b/mozilla/xpfe/components/Makefile.in
@@ -104,7 +104,7 @@ endif
 ifeq ($(OS_ARCH),WINNT)
 ifndef MOZ_PHOENIX
 ifndef MOZ_XULRUNNER
-DIRS    += urlwidget winhooks
+DIRS    += urlwidget winhooks extensions
 endif
 endif
 endif
@@ -124,7 +124,6 @@ DIRS    = \
           sidebar/public \
           bookmarks/public \
           alerts \
-          extensions \
           $(NULL)
 
 ifeq ($(OS_ARCH),WINNT) 
diff --git a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
index d9a4074dc0c..ef472f061e0 100644
--- a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
+++ b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
@@ -742,10 +742,10 @@ extern "C" void RunChromeInstallOnThread(void *data)
                     rv = reg->InstallSkin(spec.get(), PR_TRUE, PR_FALSE);
                 
 #ifndef MOZ_XUL_APP
-                if (NS_SUCCEEDED(rv) && selected)
+                if (NS_SUCCEEDED(rv) && selected && cr)
                 {
                     NS_ConvertUCS2toUTF8 utf8Args(info->GetArguments());
-                    rv = reg->SelectSkin(utf8Args, PR_TRUE);
+                    rv = cr->SelectSkin(utf8Args, PR_TRUE);
                 }
 #endif
             }
@@ -755,7 +755,7 @@ extern "C" void RunChromeInstallOnThread(void *data)
                 rv = reg->InstallLocale(spec.get(), PR_TRUE);
 
 #ifndef MOZ_XUL_APP
-                if (NS_SUCCEEDED(rv) && selected)
+                if (NS_SUCCEEDED(rv) && selected && cr)
                 {
                     NS_ConvertUCS2toUTF8 utf8Args(info->GetArguments());
                     rv = cr->SelectLocale(utf8Args, PR_TRUE);