diff --git a/panda/src/collide/collisionHandlerGravity.cxx b/panda/src/collide/collisionHandlerGravity.cxx
index f2310eec2e..a99c5fa9fd 100755
--- a/panda/src/collide/collisionHandlerGravity.cxx
+++ b/panda/src/collide/collisionHandlerGravity.cxx
@@ -66,8 +66,8 @@ set_highest_collision(const NodePath &target_node_path, const NodePath &from_nod
   // Get the maximum height for all collisions with this node.
   bool got_max = false;
   float max_height = 0.0f;
+  CollisionEntry *highest = NULL;
 
-  CollisionEntry* highest;
   _outer_space = entries.empty();
   Entries::const_iterator ei;
   for (ei = entries.begin(); ei != entries.end(); ++ei) {
diff --git a/panda/src/particlesystem/particleSystemManager.cxx b/panda/src/particlesystem/particleSystemManager.cxx
index e57974372b..02df737d4f 100644
--- a/panda/src/particlesystem/particleSystemManager.cxx
+++ b/panda/src/particlesystem/particleSystemManager.cxx
@@ -35,6 +35,15 @@ ParticleSystemManager(int every_nth_frame) :
   _nth_frame(every_nth_frame), _cur_frame(0) {
 }
 
+////////////////////////////////////////////////////////////////////
+//    Function : ParticleSystemManager
+//      Access : Public, Virtual
+// Description : Destructor
+////////////////////////////////////////////////////////////////////
+ParticleSystemManager::
+~ParticleSystemManager() {
+}
+
 ////////////////////////////////////////////////////////////////////
 //    Function : remove_particlesystem
 //      Access : public
diff --git a/panda/src/particlesystem/particleSystemManager.h b/panda/src/particlesystem/particleSystemManager.h
index 48865cd263..0a89756ba7 100644
--- a/panda/src/particlesystem/particleSystemManager.h
+++ b/panda/src/particlesystem/particleSystemManager.h
@@ -34,6 +34,7 @@
 class EXPCL_PANDAPHYSICS ParticleSystemManager {
 PUBLISHED:
   ParticleSystemManager(int every_nth_frame = 1);
+  virtual ~ParticleSystemManager();
 
   INLINE void set_frame_stepping(int every_nth_frame);
   INLINE int get_frame_stepping() const;