--- a/src/lte/model/epc-sgw-pgw-application.cc	Fri Dec 21 14:27:27 2012 +0100
+++ b/src/lte/model/epc-sgw-pgw-application.cc	Fri Dec 21 17:50:19 2012 +0100
@@ -101,8 +101,10 @@
 void
 EpcSgwPgwApplication::DoDispose ()
 {
+  NS_LOG_FUNCTION (this);
   m_s1uSocket->SetRecvCallback (MakeNullCallback<void, Ptr<Socket> > ());
   m_s1uSocket = 0;
+  delete (m_s11SapSgw);
 }
 
   
@@ -122,7 +124,7 @@
   
 EpcSgwPgwApplication::~EpcSgwPgwApplication ()
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 }
 
 

--- a/src/lte/model/lte-enb-mac.cc	Fri Dec 21 14:27:27 2012 +0100
+++ b/src/lte/model/lte-enb-mac.cc	Fri Dec 21 17:50:19 2012 +0100
@@ -627,7 +627,7 @@
 void
 LteEnbMac::DoReceiveRachPreamble  (uint8_t rapId)
 {
-  NS_LOG_FUNCTION (this << rapId);
+  NS_LOG_FUNCTION (this << (uint32_t) rapId);
   // just record that the preamble has been received; it will be processed later
   ++m_receivedRachPreambleCount[rapId]; // will create entry if not exists
 }

--- a/src/lte/model/lte-rlc-am.cc	Fri Dec 21 14:27:27 2012 +0100
+++ b/src/lte/model/lte-rlc-am.cc	Fri Dec 21 17:50:19 2012 +0100
@@ -115,6 +115,8 @@
   m_sdusBuffer.clear ();
   m_keepS0 = 0;
   m_controlPduBuffer = 0;
+
+  LteRlc::DoDispose ();
 }
 
 

--- a/src/lte/model/lte-rlc-tm.cc	Fri Dec 21 14:27:27 2012 +0100
+++ b/src/lte/model/lte-rlc-tm.cc	Fri Dec 21 17:50:19 2012 +0100
@@ -64,6 +64,8 @@
   NS_LOG_FUNCTION (this);
   m_rbsTimer.Cancel ();
   m_txBuffer.clear ();
+
+  LteRlc::DoDispose ();
 }
 
 

--- a/src/lte/model/lte-rlc-um.cc	Fri Dec 21 14:27:27 2012 +0100
+++ b/src/lte/model/lte-rlc-um.cc	Fri Dec 21 17:50:19 2012 +0100
@@ -48,6 +48,7 @@
 
 LteRlcUm::~LteRlcUm ()
 {
+  NS_LOG_FUNCTION (this);
 }
 
 TypeId
@@ -71,6 +72,8 @@
   NS_LOG_FUNCTION (this);
   m_reorderingTimer.Cancel ();
   m_rbsTimer.Cancel ();
+
+  LteRlc::DoDispose ();
 }
 
 /**

--- a/src/lte/model/lte-rlc.cc	Fri Dec 21 14:27:27 2012 +0100
+++ b/src/lte/model/lte-rlc.cc	Fri Dec 21 17:50:19 2012 +0100
@@ -200,6 +200,7 @@
 LteRlcSm::DoDispose ()
 {
   NS_LOG_FUNCTION (this);
+  LteRlc::DoDispose ();
 }
 
 void