--- a/src/lte/model/lte-common.cc	Thu Nov 14 22:43:53 2013 +0100
+++ b/src/lte/model/lte-common.cc	Thu Nov 14 15:25:33 2013 -0800
@@ -269,7 +269,7 @@
     }
 
   uint8_t ieValue = lround (hysteresisDb * 2.0);
-  NS_ASSERT (ieValue >= 0);
+  //  NS_ASSERT (ieValue >= 0);  // always true due to limited range of data type
   NS_ASSERT (ieValue <= 30);
   return ieValue;
 }
@@ -301,7 +301,7 @@
     }
 
   uint8_t ieValue = lround (a3OffsetDb * 2.0);
-  NS_ASSERT (ieValue >= -30);
+  // NS_ASSERT (ieValue >= -30);  // always true due to limited range of data type
   NS_ASSERT (ieValue <= 30);
   return ieValue;
 }

--- a/src/lte/model/lte-ue-rrc.cc	Thu Nov 14 22:43:53 2013 +0100
+++ b/src/lte/model/lte-ue-rrc.cc	Thu Nov 14 15:25:33 2013 -0800
@@ -1487,7 +1487,7 @@
           storedMeasIt->second.rsrp = (1 - m_varMeasConfig.aRsrp) * storedMeasIt->second.rsrp
             + m_varMeasConfig.aRsrp * rsrp;
 
-          if (isnan (storedMeasIt->second.rsrq))
+          if (std::isnan (storedMeasIt->second.rsrq))
             {
               // the previous RSRQ measurements provided UE PHY are invalid
               storedMeasIt->second.rsrq = rsrq; // replace it with unfiltered value

--- a/src/lte/test/test-lte-handover-target.cc	Thu Nov 14 22:43:53 2013 +0100
+++ b/src/lte/test/test-lte-handover-target.cc	Thu Nov 14 15:25:33 2013 -0800
@@ -156,12 +156,12 @@
 
   uint16_t nEnb = gridSizeX * gridSizeY;
 
-  if ((sourceCellId < 0) && (sourceCellId > nEnb))
+  if (sourceCellId > nEnb)
     {
       NS_FATAL_ERROR ("Invalid source cell ID " << sourceCellId);
     }
 
-  if ((targetCellId < 0) && (targetCellId > nEnb))
+  if (targetCellId > nEnb)
     {
       NS_FATAL_ERROR ("Invalid target cell ID " << targetCellId);
     }