--- a/src/lte/helper/lte-helper.cc	Mon Apr 08 16:25:35 2013 +0200
+++ b/src/lte/helper/lte-helper.cc	Mon Apr 08 17:41:53 2013 +0200
@@ -120,9 +120,6 @@
   m_phyTxStats = CreateObject<PhyTxStatsCalculator> ();
   m_phyRxStats = CreateObject<PhyRxStatsCalculator> ();
   m_macStats = CreateObject<MacStatsCalculator> ();
-  m_rlcStats = CreateObject<RadioBearerStatsCalculator> ("RLC");
-  m_pdcpStats = CreateObject<RadioBearerStatsCalculator> ("PDCP");
-
   Object::DoStart ();
 
 }
@@ -835,6 +832,8 @@
 void
 LteHelper::EnableRlcTraces (void)
 {
+  NS_ASSERT_MSG (m_rlcStats == 0, "please make sure that LteHelper::EnableRlcTraces is called at most once");
+  m_rlcStats = CreateObject<RadioBearerStatsCalculator> ("RLC");
   m_radioBearerStatsConnector.EnableRlcStats (m_rlcStats);
 }
 
@@ -1343,6 +1342,8 @@
 void
 LteHelper::EnablePdcpTraces (void)
 {
+  NS_ASSERT_MSG (m_pdcpStats == 0, "please make sure that LteHelper::EnablePdcpTraces is called at most once");
+  m_pdcpStats = CreateObject<RadioBearerStatsCalculator> ("PDCP");
   m_radioBearerStatsConnector.EnablePdcpStats (m_pdcpStats);
 }
 

--- a/src/lte/model/lte-enb-rrc.cc	Mon Apr 08 16:25:35 2013 +0200
+++ b/src/lte/model/lte-enb-rrc.cc	Mon Apr 08 17:41:53 2013 +0200
@@ -391,7 +391,7 @@
   lcinfo.gbrDl = bearer.gbrQosInfo.gbrDl;
   m_rrc->m_cmacSapProvider->AddLc (lcinfo, rlc->GetLteMacSapUser ());
   
-  if (drbInfo->m_rlc->GetTypeId () == LteRlcAm::GetTypeId ())
+  if (rlcTypeId == LteRlcAm::GetTypeId ())
     {
       drbInfo->m_rlcConfig.choice =  LteRrcSap::RlcConfig::AM;
     }

--- a/src/lte/model/lte-ue-phy.cc	Mon Apr 08 16:25:35 2013 +0200
+++ b/src/lte/model/lte-ue-phy.cc	Mon Apr 08 17:41:53 2013 +0200
@@ -559,12 +559,13 @@
 {
   NS_LOG_FUNCTION (this);
   
+
   // apply transmission mode gain
   NS_ASSERT (m_transmissionMode < m_txModeGain.size ());
   SpectrumValue newSinr = sinr;
   newSinr *= m_txModeGain.at (m_transmissionMode);
 
-// CREATE DlCqiLteControlMessage
+  // CREATE DlCqiLteControlMessage
   Ptr<DlCqiLteControlMessage> msg = Create<DlCqiLteControlMessage> ();
   CqiListElement_s dlcqi;
   std::vector<int> cqi;