diff --git a/direct/src/leveleditor/Configrc b/direct/src/leveleditor/Configrc
index 04d9b9d194..f7192ecce4 100644
--- a/direct/src/leveleditor/Configrc
+++ b/direct/src/leveleditor/Configrc
@@ -5,7 +5,9 @@ level-editor-hoods TT
 # level-editor-hoods TT DD DG MM BR DL
 style-path-prefix /i
 
-load-display pandadx
+# For the moment, pandadx8 is unstable
+#load-display pandadx8
+load-display pandagl
 chan-config-sanity-check #f
 multipass-viz none
 win-width 800
diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py
index 7d87bf62b4..dae9ce1a44 100644
--- a/direct/src/leveleditor/LevelEditor.py
+++ b/direct/src/leveleditor/LevelEditor.py
@@ -18,6 +18,7 @@ import getopt
 import sys
 import whrandom
 import Task
+import __builtin__
 
 visualizeZones = base.config.GetBool("visualize-zones", 0)
 dnaDirectory = Filename.expandFrom(base.config.GetString("dna-directory", "$TTMODELS/src/dna"))
@@ -206,7 +207,12 @@ try:
 except NameError:
     print "Loading LevelEditor for hoods: ", hoods
     # DNAStorage instance for storing level DNA info
-    __builtins__["DNASTORE"] = DNASTORE = DNAStorage()
+
+    # We need to use the __builtin__.foo syntax, not the
+    # __builtins__["foo"] syntax, since this file runs at the top
+    # level.
+    __builtin__.DNASTORE = DNASTORE = DNAStorage()
+    
     # Load the generic storage files
     loadDNAFile(DNASTORE, 'phase_4/dna/storage.dna', CSDefault, 1)
     loadDNAFile(DNASTORE, 'phase_5/dna/storage_town.dna', CSDefault, 1)
@@ -235,7 +241,7 @@ except NameError:
         loadDNAFile(DNASTORE, 'phase_8/dna/storage_DL.dna', CSDefault, 1)
         loadDNAFile(DNASTORE, 'phase_8/dna/storage_DL_sz.dna', CSDefault, 1)
         loadDNAFile(DNASTORE, 'phase_8/dna/storage_DL_town.dna', CSDefault, 1)
-    __builtins__["dnaLoaded"] = 1
+    __builtin__.dnaLoaded = 1
 
 # Precompute class types for type comparisons
 DNA_CORNICE = DNACornice.getClassType()
diff --git a/direct/src/leveleditor/printfiles b/direct/src/leveleditor/printfiles
index d3ce8df727..d8f9af35e0 100755
--- a/direct/src/leveleditor/printfiles
+++ b/direct/src/leveleditor/printfiles
@@ -6,38 +6,35 @@ echo $DIRECT/src/leveleditor/Configrc
 
 # Python files
 echo $WINTOOLS/bin/python.exe
-echo $WINTOOLS/sdk/python/Python-2.2/DLLs/python22.dll
-echo $WINTOOLS/sdk/python/Python-2.2/DLLs/PyWinTypes22.dll
-echo $WINTOOLS/sdk/python/Python-2.2/DLLs/_sre.pyd
-echo $WINTOOLS/sdk/python/Python-2.2/DLLs/_tkinter.pyd
-echo $WINTOOLS/sdk/python/Python-2.2/DLLs/zlib.pyd
-echo $WINTOOLS/sdk/python/Python-2.2/DLLs/win32api.pyd
-echo $WINTOOLS/sdk/python/Python-2.2/DLLs/_socket.pyd
+echo $WINTOOLS/sdk/python/Python-2.2.2/PCbuild/python22.dll
+echo $WINTOOLS/sdk/python/Python-2.2.2/PCbuild/_sre.pyd
+echo $WINTOOLS/sdk/python/Python-2.2.2/PCbuild/_tkinter.pyd
+echo $WINTOOLS/sdk/python/Python-2.2.2/PCbuild/_socket.pyd
 
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/lib-tk
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/Pmw
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/linecache.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/traceback.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/__future__.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/whrandom.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/copy_reg.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/copy.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/fnmatch.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/re.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/sre.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/sre_parse.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/sre_constants.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/sre_compile.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/types.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/string.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/os.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/site.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/stat.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/UserDict.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/ntpath.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/random.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/getopt.py
-echo $WINTOOLS/sdk/python/Python-2.2/Lib/fpformat.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/lib-tk
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/Pmw
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/linecache.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/traceback.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/__future__.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/whrandom.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/copy_reg.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/copy.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/fnmatch.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/re.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/sre.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/sre_parse.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/sre_constants.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/sre_compile.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/types.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/string.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/os.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/site.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/stat.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/UserDict.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/ntpath.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/random.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/getopt.py
+echo $WINTOOLS/sdk/python/Python-2.2.2/Lib/fpformat.py
 
 # Libraries
 echo $WINTOOLS/lib
@@ -48,7 +45,9 @@ echo $DTOOL/lib/libdtoolconfig.dll
 echo $PANDA/lib/libpandaexpress.dll
 echo $PANDA/lib/libpanda.dll
 echo $PANDA/lib/libpandaphysics.dll
-echo $PANDA/lib/libpandadx.dll
+echo $PANDA/lib/libwindisplay.dll
+echo $PANDA/lib/libpandadx7.dll
+echo $PANDA/lib/libpandadx8.dll
 echo $PANDA/lib/libpandagl.dll
 echo $PANDA/lib/libmiles_audio.dll
 echo $DIRECT/lib/libdirect.dll