--- a/src/lte/helper/mac-stats-calculator.h	Fri Nov 09 17:56:59 2012 -0800
+++ b/src/lte/helper/mac-stats-calculator.h	Fri Nov 09 17:57:28 2012 -0800
@@ -31,7 +31,6 @@
 
 /**
  * Takes care of storing the information generated at MAC layer. Metrics saved are:
- *time\tframe\tsframe\tRNTI\tmcsTb1\tsizeTb1\tmcsTb2\tsizeTb2
  *   - Timestamp (in seconds)
  *   - Frame index
  *   - Subframe index

--- a/utils/print-introspected-doxygen.cc	Fri Nov 09 17:56:59 2012 -0800
+++ b/utils/print-introspected-doxygen.cc	Fri Nov 09 17:57:28 2012 -0800
@@ -61,11 +61,18 @@
 	 << "    " << listLineStart << "Set with class: " << reference << info.checker->GetValueTypeName () << listLineStop << std::endl;
       if (info.checker->HasUnderlyingTypeInformation ())
 	{
-	  os << "    " << listLineStart << "Underlying type: " << reference << info.checker->GetUnderlyingTypeInformation () << listLineStop << std::endl;
+	  os << "    " << listLineStart << "Underlying type: ";
+	  if (    (info.checker->GetValueTypeName () != "ns3::EnumValue")
+	       && (info.checker->GetUnderlyingTypeInformation () != "std::string")
+	      )
+	    {
+	      os << reference;
+	    }
+	  os << info.checker->GetUnderlyingTypeInformation () << listLineStop << std::endl;
 	}
       if (info.flags & TypeId::ATTR_CONSTRUCT && info.accessor->HasSetter ())
 	{
-	  os << "    " << listLineStart << "Initial value: " << reference << info.initialValue->SerializeToString (info.checker) << listLineStop << std::endl;
+	  os << "    " << listLineStart << "Initial value: " << info.initialValue->SerializeToString (info.checker) << listLineStop << std::endl;
 	}
       os << "    " << listLineStart << "Flags: ";
       if (info.flags & TypeId::ATTR_CONSTRUCT && info.accessor->HasSetter ())