diff --git a/direct/src/gui/DirectScrolledFrame.py b/direct/src/gui/DirectScrolledFrame.py
index d2783d39ef..4835598b55 100644
--- a/direct/src/gui/DirectScrolledFrame.py
+++ b/direct/src/gui/DirectScrolledFrame.py
@@ -104,4 +104,3 @@ class DirectScrolledFrame(DirectFrame):
         del self.verticalScroll
         del self.horizontalScroll
         DirectFrame.destroy(self)
-
diff --git a/direct/src/interval/ActorInterval.py b/direct/src/interval/ActorInterval.py
index 920efb2cdd..573b884d3a 100644
--- a/direct/src/interval/ActorInterval.py
+++ b/direct/src/interval/ActorInterval.py
@@ -66,7 +66,7 @@ class ActorInterval(Interval.Interval):
             self.endFrame = 0
         else:
 
-            self.frameRate = self.controls[0].getAnim().getBaseFrameRate() * abs(playRate)
+            self.frameRate = self.controls[0].getFrameRate() * abs(playRate)
             # Compute start and end frames.
             if startFrame != None:
                 self.startFrame = startFrame
diff --git a/direct/src/showbase/EventManager.py b/direct/src/showbase/EventManager.py
index d74251c34e..101698de1a 100644
--- a/direct/src/showbase/EventManager.py
+++ b/direct/src/showbase/EventManager.py
@@ -78,6 +78,8 @@ class EventManager:
             return eventParameter.getWstringValue()
         elif (eventParameter.isTypedRefCount()):
             return eventParameter.getTypedRefCountValue()
+        elif (eventParameter.isEmpty()):
+            return None
         else:
             # Must be some user defined type, return the ptr
             # which will be downcast to that type