diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
index 8fc6557cf4..7802ebc3eb 100644
--- a/direct/src/actor/Actor.py
+++ b/direct/src/actor/Actor.py
@@ -4,6 +4,7 @@ __all__ = ['Actor']
 
 from pandac.PandaModules import *
 from direct.showbase.DirectObject import DirectObject
+from direct.directnotify import DirectNotifyGlobal
 from pandac.PandaModules import LODNode
 import types, copy
 
@@ -12,7 +13,7 @@ class Actor(DirectObject, NodePath):
     Actor class: Contains methods for creating, manipulating
     and playing animations on characters
     """
-    notify = directNotify.newCategory("Actor")
+    notify = DirectNotifyGlobal.directNotify.newCategory("Actor")
     partPrefix = "__Actor_"
 
     modelLoaderOptions = LoaderOptions(LoaderOptions.LFSearch |
diff --git a/dtool/src/dtoolbase/p3dtoolbase_composite2.cxx b/dtool/src/dtoolbase/p3dtoolbase_composite2.cxx
index 145c86d801..8cd964b4fd 100644
--- a/dtool/src/dtoolbase/p3dtoolbase_composite2.cxx
+++ b/dtool/src/dtoolbase/p3dtoolbase_composite2.cxx
@@ -2,7 +2,7 @@
 #include "mutexWin32Impl.cxx"
 #include "mutexSpinlockImpl.cxx"
 #include "neverFreeMemory.cxx"
-#include "pdtoa.c"
+#include "pdtoa.cxx"
 #include "pstrtod.cxx"
 #include "register_type.cxx"
 #include "typeHandle.cxx"
diff --git a/dtool/src/dtoolbase/pdtoa.c b/dtool/src/dtoolbase/pdtoa.cxx
similarity index 100%
rename from dtool/src/dtoolbase/pdtoa.c
rename to dtool/src/dtoolbase/pdtoa.cxx
diff --git a/panda/src/gobj/geomPrimitive.cxx b/panda/src/gobj/geomPrimitive.cxx
index 83ae80b266..80408a18c5 100644
--- a/panda/src/gobj/geomPrimitive.cxx
+++ b/panda/src/gobj/geomPrimitive.cxx
@@ -22,6 +22,8 @@
 #include "geomVertexWriter.h"
 #include "geomVertexRewriter.h"
 #include "geomPoints.h"
+#include "geomLines.h"
+#include "geomTriangles.h"
 #include "preparedGraphicsObjects.h"
 #include "internalName.h"
 #include "bamReader.h"
diff --git a/panda/src/grutil/frameRateMeter.cxx b/panda/src/grutil/frameRateMeter.cxx
index 58457c01a7..cbd0beb187 100644
--- a/panda/src/grutil/frameRateMeter.cxx
+++ b/panda/src/grutil/frameRateMeter.cxx
@@ -180,6 +180,10 @@ clear_window() {
 ////////////////////////////////////////////////////////////////////
 bool FrameRateMeter::
 cull_callback(CullTraverser *trav, CullTraverserData &data) {
+  // This triggers when you try to parent a frame rate meter into
+  // the scene graph yourself.  Instead, use setup_window().
+  nassertr(_display_region != NULL, false);
+
   Thread *current_thread = trav->get_current_thread();
 
   // Statistics