diff --git a/model/pit/ccnx-pit-entry-impl.h b/model/pit/ccnx-pit-entry-impl.h
index c707cd6..4b49cbd 100644
--- a/model/pit/ccnx-pit-entry-impl.h
+++ b/model/pit/ccnx-pit-entry-impl.h
@@ -46,7 +46,7 @@
   
   virtual ~CcnxPitEntryImpl ()
   {
-    CONTAINER.i_time.erase (*this);
+    CONTAINER.i_time.erase (Pit::time_index::s_iterator_to (*this));
     
     CONTAINER.RescheduleCleaning ();
   }
@@ -54,7 +54,7 @@
   virtual void
   UpdateLifetime (const Time &offsetTime)
   {
-    CONTAINER.i_time.erase (*this);
+    CONTAINER.i_time.erase (Pit::time_index::s_iterator_to (*this));
     super::UpdateLifetime (offsetTime);
     CONTAINER.i_time.insert (*this);
 
diff --git a/utils/random-policy.h b/utils/random-policy.h
index 2b17fb9..c745b3b 100644
--- a/utils/random-policy.h
+++ b/utils/random-policy.h
@@ -70,7 +70,7 @@
       }
     };
 
-    typedef boost::intrusive::set< Container,
+    typedef boost::intrusive::multiset< Container,
                                    boost::intrusive::compare< MemberHookLess< Container > >,
                                    Hook > policy_container;