diff --git a/direct/src/cluster/ClusterClient.py b/direct/src/cluster/ClusterClient.py
index bc53afe216..fae2fc88d5 100644
--- a/direct/src/cluster/ClusterClient.py
+++ b/direct/src/cluster/ClusterClient.py
@@ -113,8 +113,10 @@ class ClusterClient(DirectObject.DirectObject):
     def loadModel(self, nodePath):
         pass
 
-    def __call__(self, commandString, fLocally = 1):
+    def __call__(self, commandString, fLocally = 1, serverNum = None):
         # Execute remotely
+        if serverNum is not None:
+            self.serverList[serverNum].sendCommandString(commandString)
         for server in self.serverList:
             server.sendCommandString(commandString)
         if fLocally:
@@ -348,7 +350,7 @@ class DummyClusterClient(DirectObject.DirectObject):
     def __init__(self):
         pass
 
-    def __call__(self, commandString, fLocally = 1):
+    def __call__(self, commandString, fLocally = 1, serverNum = None):
         if fLocally:
             # Execute locally
             exec( commandString, __builtins__ )
diff --git a/direct/src/directdevices/DirectJoybox.py b/direct/src/directdevices/DirectJoybox.py
index b17d032111..86ec37652a 100644
--- a/direct/src/directdevices/DirectJoybox.py
+++ b/direct/src/directdevices/DirectJoybox.py
@@ -3,6 +3,7 @@ from PandaObject import *
 from DirectDeviceManager import *
 from DirectUtil import *
 import OnscreenText
+import Task
 
 """
 TODO:
diff --git a/direct/src/directscripts/runPythonEmacs b/direct/src/directscripts/runPythonEmacs
index a90b55a64d..97e4108aaf 100755
--- a/direct/src/directscripts/runPythonEmacs
+++ b/direct/src/directscripts/runPythonEmacs
@@ -60,6 +60,11 @@ if [ "$VRIDE" ]; then
     VRIDE=`cygpath -w $VRIDE`
     export VRIDE
 fi
+if [ "$FOURD" ]; then
+    if [ "$debug" ]; then echo "FOURD   $FOURD"; fi
+    FOURD=`cygpath -w $FOURD`
+    export FOURD
+fi
 if [ "$WINTOOLS" ]; then
     if [ "$debug" ]; then echo "WINTOOLS  $WINTOOLS"; fi
     WINTOOLS=`cygpath -w $WINTOOLS`