diff --git a/direct/src/distributed/CRDataCache.py b/direct/src/distributed/CRDataCache.py
index 835378d8da..3cfad31136 100755
--- a/direct/src/distributed/CRDataCache.py
+++ b/direct/src/distributed/CRDataCache.py
@@ -1,5 +1,10 @@
 from direct.distributed.CachedDOData import CachedDOData
 
+# This has to be imported for __builtin__.config
+from direct.showbase import ShowBase
+
+__all__ = ["CRDataCache"]
+
 class CRDataCache:
     # Stores cached data for DistributedObjects between instantiations on the client
 
diff --git a/direct/src/distributed/DistributedObjectBase.py b/direct/src/distributed/DistributedObjectBase.py
index 15c8ee1b7e..ba1d8a21bc 100755
--- a/direct/src/distributed/DistributedObjectBase.py
+++ b/direct/src/distributed/DistributedObjectBase.py
@@ -1,6 +1,6 @@
 
 from direct.showbase.DirectObject import DirectObject
-#from direct.directnotify.DirectNotifyGlobal import directNotify
+from direct.directnotify import DirectNotifyGlobal
 
 class DistributedObjectBase(DirectObject):
     """
@@ -8,7 +8,7 @@ class DistributedObjectBase(DirectObject):
     (i.e. distributed) objects.  These will usually (always?) have a
     dclass entry in a *.dc file.
     """
-    notify = directNotify.newCategory("DistributedObjectBase")
+    notify = DirectNotifyGlobal.directNotify.newCategory("DistributedObjectBase")
 
     def __init__(self, cr):
         assert self.notify.debugStateCall(self)