diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi
index 380f9364aa..381293ae74 100755
--- a/direct/src/directscripts/packpanda.nsi
+++ b/direct/src/directscripts/packpanda.nsi
@@ -90,8 +90,9 @@ Section "${SMDIRECTORY}" SecCore
         File /r ${PANDA}\etc\*
         SetOutPath $INSTDIR\direct
         File /r /x CVS /x Opt?-Win32 ${PSOURCE}\direct\*.py
-        File /r /x CVS /x Opt?-Win32 ${PSOURCE}\direct\src\directscripts\*
         File ${PANDA}\direct\__init__.py
+        SetOutPath $INSTDIR\direct\src\directscripts
+        File /r /x CVS /x Opt?-Win32 ${PSOURCE}\direct\src\directscripts\*
         SetOutPath $INSTDIR\pandac
         File /r ${PANDA}\pandac\*.py
         SetOutPath $INSTDIR\python
@@ -205,12 +206,6 @@ Section -post
         Call AddToPath
         !endif
 
-        DetailPrint "Registering Helix Preferences..."
-        WriteRegStr HKLM "Software\Helix\HelixSDK\10.0\Preferences\UseOverlay" "" "0"
-        WriteRegStr HKLM "Software\Helix\HelixSDK\10.0\Preferences\UseWinDraw" "" "0"
-        WriteRegStr HKCU "Software\Helix\HelixSDK\10.0\Preferences\UseOverlay" "" "0"
-        WriteRegStr HKCU "Software\Helix\HelixSDK\10.0\Preferences\UseWinDraw" "" "0"
-
         DetailPrint "Adding the uninstaller ..."
         Delete "$INSTDIR\uninst.exe"
         WriteUninstaller "$INSTDIR\uninst.exe"
diff --git a/direct/src/directscripts/packpanda.py b/direct/src/directscripts/packpanda.py
index db4391135c..762de5009e 100755
--- a/direct/src/directscripts/packpanda.py
+++ b/direct/src/directscripts/packpanda.py
@@ -69,12 +69,13 @@ OPTIONS = ParseOptions(sys.argv[1:])
 
 PANDA=None
 for dir in sys.path:
-    if os.path.exists(os.path.join(dir,"direct")) and os.path.exists(os.path.join(dir,"pandac")) and os.path.exists(os.path.join(dir,"python")):
+    if (dir != "") and os.path.exists(os.path.join(dir,"direct")) and os.path.exists(os.path.join(dir,"pandac")) and os.path.exists(os.path.join(dir,"python")) and os.path.exists(os.path.join(dir,"nsis")):
         PANDA=os.path.abspath(dir)
 if (PANDA is None):
   sys.exit("Cannot locate the panda root directory in the python path (cannot locate directory containing direct and pandac).")
+print "PANDA located at "+PANDA
 
-if (os.path.exists(os.path.join("PANDA","..","makepanda","makepanda.py"))) and (os.path.exists(os.path.join("PANDA","..","thirdparty","win-nsis","makensis.exe"))):
+if (os.path.exists(os.path.join(PANDA,"..","makepanda","makepanda.py"))) and (os.path.exists(os.path.join(PANDA,"..","thirdparty","win-nsis","makensis.exe"))):
   PSOURCE=os.path.abspath(os.path.join(PANDA,".."))
   NSIS=os.path.abspath(os.path.join(PANDA,"..","thirdparty","win-nsis"))
 else: