diff --git a/direct/src/directtools/DirectManipulation.py b/direct/src/directtools/DirectManipulation.py
index aa7c917349..83ee48f619 100644
--- a/direct/src/directtools/DirectManipulation.py
+++ b/direct/src/directtools/DirectManipulation.py
@@ -115,7 +115,8 @@ class DirectManipulationControl(PandaObject):
         self.objectHandles.hideGuides()
         # Restart followSelectedNodePath task
         self.spawnFollowSelectedNodePathTask()
-        messenger.send('DIRECT_manipulateObjectCleanup')
+        messenger.send('DIRECT_manipulateObjectCleanup',
+                       [direct.selected.getSelectedAsList()])
 
     def spawnFollowSelectedNodePathTask(self):
         # If nothing selected, just return
@@ -498,7 +499,8 @@ class DirectManipulationControl(PandaObject):
             # Move the objects with the widget
             direct.selected.moveWrtWidgetAll()
             # Let everyone know that something was moved
-            messenger.send('DIRECT_manipulateObjectCleanup')
+            messenger.send('DIRECT_manipulateObjectCleanup',
+                           [direct.selected.getSelectedAsList()])
 
 class ObjectHandles(NodePath,PandaObject):
     def __init__(self):
diff --git a/direct/src/level/LevelSpec.py b/direct/src/level/LevelSpec.py
index 04d70e9fd0..31d2cdbbcc 100755
--- a/direct/src/level/LevelSpec.py
+++ b/direct/src/level/LevelSpec.py
@@ -203,10 +203,12 @@ class LevelSpec:
 
         def saveToDisk(self, filename=None, makeBackup=1):
             """returns zero on failure"""
+            print 'saveToDisk', filename
             if filename is None:
                 filename = self.filename
 
             if makeBackup and self.privFileExists(filename):
+                print 'HERE'
                 # create a backup
                 try:
                     backupFilename = self.privGetBackupFilename()
diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py
index 09bb7ee89e..e45c5f86ef 100644
--- a/direct/src/leveleditor/LevelEditor.py
+++ b/direct/src/leveleditor/LevelEditor.py
@@ -1184,11 +1184,11 @@ class LevelEditor(NodePath, PandaObject):
             # If it exists, set the name of the DNA Node
             dnaNode.setName(newName)
 
-    def updateSelectedPose(self):
+    def updateSelectedPose(self, nodePathList):
         """
         Update the DNA database to reflect selected objects current positions
         """
-        for selectedNode in direct.selected:
+        for selectedNode in nodePathList:
             # Is this a DNA Object in the DNASTORE database?
             dnaObject = self.findDNANode(selectedNode)
             if dnaObject:
diff --git a/direct/src/tkpanels/MopathRecorder.py b/direct/src/tkpanels/MopathRecorder.py
index 5186947766..48d75221ba 100644
--- a/direct/src/tkpanels/MopathRecorder.py
+++ b/direct/src/tkpanels/MopathRecorder.py
@@ -748,7 +748,7 @@ class MopathRecorder(AppShell, PandaObject):
             elif direct.selected.last.id() == self.tangentMarker.id():
                 self.manipulandumId = self.tangentMarker.id()
               
-    def manipulateObjectCleanupHook(self):
+    def manipulateObjectCleanupHook(self, nodePathList = []):
         # Clear flag
         self.manipulandumId = None
             
diff --git a/direct/src/tkpanels/Placer.py b/direct/src/tkpanels/Placer.py
index cc2212f55b..d5f2b20902 100644
--- a/direct/src/tkpanels/Placer.py
+++ b/direct/src/tkpanels/Placer.py
@@ -567,7 +567,8 @@ class Placer(AppShell):
         
     def xformStop(self, data):
         # Throw event to signal manipulation done
-        messenger.send('DIRECT_manipulateObjectCleanup')
+        # Send nodepath as a list
+        messenger.send('DIRECT_manipulateObjectCleanup', [[self['nodePath']]])
         # Update placer to reflect new state
         self.updatePlacer()
         # If moving widget restart follow task