diff --git a/panda/src/event/asyncTaskManager.cxx b/panda/src/event/asyncTaskManager.cxx
index 3ef2086833..f6b664e01a 100644
--- a/panda/src/event/asyncTaskManager.cxx
+++ b/panda/src/event/asyncTaskManager.cxx
@@ -36,8 +36,8 @@ AsyncTaskManager(const string &name, int num_threads) :
   Namable(name),
   _num_threads(num_threads),
   _cvar(_lock),
-  _state(S_initial),
-  _num_tasks(0)
+  _num_tasks(0),
+  _state(S_initial)
 {
 }
 
diff --git a/panda/src/event/eventParameter.I b/panda/src/event/eventParameter.I
index 66d5b562c0..4c78c799e7 100644
--- a/panda/src/event/eventParameter.I
+++ b/panda/src/event/eventParameter.I
@@ -314,15 +314,6 @@ INLINE EventStoreValueBase::
 EventStoreValueBase() {
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: EventStoreValueBase::Destructor
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE EventStoreValueBase::
-~EventStoreValueBase() {
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: EventStoreTypedRefCount::Constructor
 //       Access: Public
diff --git a/panda/src/event/eventParameter.cxx b/panda/src/event/eventParameter.cxx
index 6b5786b575..c7a6472088 100644
--- a/panda/src/event/eventParameter.cxx
+++ b/panda/src/event/eventParameter.cxx
@@ -47,6 +47,24 @@ output(ostream &out) const {
   }
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: EventStoreValueBase::Destructor
+//       Access: Public, Virtual
+//  Description: 
+////////////////////////////////////////////////////////////////////
+EventStoreValueBase::
+~EventStoreValueBase() {
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: EventStoreTypedRefCount::Destructor
+//       Access: Public, Virtual
+//  Description: 
+////////////////////////////////////////////////////////////////////
+EventStoreTypedRefCount::
+~EventStoreTypedRefCount() {
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: EventStoreTypedRefCount::output
 //       Access: Public, Virtual
diff --git a/panda/src/event/eventParameter.h b/panda/src/event/eventParameter.h
index 8d421e80a5..a7b27928cf 100644
--- a/panda/src/event/eventParameter.h
+++ b/panda/src/event/eventParameter.h
@@ -90,7 +90,7 @@ INLINE ostream &operator << (ostream &out, const EventParameter &param);
 class EXPCL_PANDA EventStoreValueBase : public TypedWritableReferenceCount {
 public:
   INLINE EventStoreValueBase();
-  INLINE ~EventStoreValueBase();
+  virtual ~EventStoreValueBase();
   virtual void output(ostream &out) const=0;
 
 public:
@@ -120,6 +120,7 @@ private:
 class EXPCL_PANDA EventStoreTypedRefCount : public EventStoreValueBase {
 public:
   INLINE EventStoreTypedRefCount(const TypedReferenceCount *value);
+  virtual ~EventStoreTypedRefCount();
 
   INLINE void set_value(const TypedReferenceCount *value);
   INLINE TypedReferenceCount *get_value() const;
diff --git a/panda/src/event/event_composite.cxx b/panda/src/event/event_composite.cxx
index e4f7c17e71..2e4e8f7d52 100644
--- a/panda/src/event/event_composite.cxx
+++ b/panda/src/event/event_composite.cxx
@@ -1 +1,2 @@
 #include "event_composite1.cxx"
+#include "event_composite2.cxx"