diff --git a/Property_map/doc/Property_map/PackageDescription.txt b/Property_map/doc/Property_map/PackageDescription.txt
index 90c3b8f626a..a768dfacd9b 100644
--- a/Property_map/doc/Property_map/PackageDescription.txt
+++ b/Property_map/doc/Property_map/PackageDescription.txt
@@ -13,7 +13,7 @@
 \cgalPkgShortInfoBegin
 \cgalPkgSince{3.5}
 \cgalPkgBib{cgal:fs-cbpm}
-\cgalPkgLicense{\ref licensesGPL "GPL"}
+\cgalPkgLicense{\ref licensesGPL "LGPL"}
 \cgalPkgShortInfoEnd
 \cgalPkgDescriptionEnd
 
diff --git a/Property_map/include/CGAL/Index_property_map.h b/Property_map/include/CGAL/Index_property_map.h
index 1b29f42d9a5..580d459e84a 100644
--- a/Property_map/include/CGAL/Index_property_map.h
+++ b/Property_map/include/CGAL/Index_property_map.h
@@ -1,10 +1,10 @@
 // Copyright (c) 20009  INRIA Sophia-Antipolis (France).
 // All rights reserved.
 //
-// This file is part of CGAL (www.cgal.org).
-// You can redistribute it and/or modify it under the terms of the GNU
-// General Public License as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
 //
 // Licensees holding a valid commercial license may use this file in
 // accordance with the commercial license agreement provided with the software.
@@ -20,8 +20,6 @@
 #ifndef CGAL_INDEX_PROPERTY_MAP_H
 #define CGAL_INDEX_PROPERTY_MAP_H
 
-#include <CGAL/point_set_processing_assertions.h>
-#include <CGAL/trace.h>
 #include <CGAL/property_map.h>
 #include <boost/shared_ptr.hpp>
 
@@ -95,8 +93,6 @@ public:
     
   : m_index_map(new Index_map)  // Allocate std::map
   {
-    CGAL_TRACE("  Index_property_map: index elements in temporary std::map\n");
-
     // Index elements in std::map
     Iter it;
     unsigned int index;
@@ -129,9 +125,7 @@ public:
     Iter first,  ///< iterator over the first element (index 0)
     Iter /*beyond*/) ///< past-the-end iterator over the elements
   : m_first(first)
-  {
-    CGAL_TRACE("  Index_property_map: optimized version for a random access container\n");
-  }
+  {}
 
   /// Free function to access the map elements.
   friend inline
diff --git a/Property_map/include/CGAL/property_map.h b/Property_map/include/CGAL/property_map.h
index fa41272e98a..8b1585e7b8c 100644
--- a/Property_map/include/CGAL/property_map.h
+++ b/Property_map/include/CGAL/property_map.h
@@ -1,10 +1,10 @@
 // Copyright (c) 2008-2009 GeometryFactory and INRIA
 // All rights reserved.
 //
-// This file is part of CGAL (www.cgal.org).
-// You can redistribute it and/or modify it under the terms of the GNU
-// General Public License as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
 //
 // Licensees holding a valid commercial license may use this file in
 // accordance with the commercial license agreement provided with the software.
diff --git a/STL_Extension/doc/STL_Extension/Doxyfile.in b/STL_Extension/doc/STL_Extension/Doxyfile.in
index 42b323cc9c0..37542262ba6 100644
--- a/STL_Extension/doc/STL_Extension/Doxyfile.in
+++ b/STL_Extension/doc/STL_Extension/Doxyfile.in
@@ -1,3 +1,5 @@
 @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
 
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - STL Extensions for CGAL"
+
+INPUT += ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/value_type_traits.h
\ No newline at end of file
diff --git a/STL_Extension/doc/STL_Extension/PackageDescription.txt b/STL_Extension/doc/STL_Extension/PackageDescription.txt
index dc611a2a8c6..1c3c8a18f10 100644
--- a/STL_Extension/doc/STL_Extension/PackageDescription.txt
+++ b/STL_Extension/doc/STL_Extension/PackageDescription.txt
@@ -116,6 +116,7 @@
 - `CGAL::Location_policy<Tag>`
 - `CGAL::Fast_location`
 - `CGAL::Compact_location`
+- `CGAL::value_type_traits<T>`
 
 */
 
diff --git a/STL_Extension/include/CGAL/value_type_traits.h b/STL_Extension/include/CGAL/value_type_traits.h
index be2410fa40f..8783327fcea 100644
--- a/STL_Extension/include/CGAL/value_type_traits.h
+++ b/STL_Extension/include/CGAL/value_type_traits.h
@@ -1,10 +1,11 @@
 // Copyright (c) 2007-09  INRIA Sophia-Antipolis (France).
 // All rights reserved.
 //
-// This file is part of CGAL (www.cgal.org).
-// You can redistribute it and/or modify it under the terms of the GNU
-// General Public License as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
+//
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
 //
 // Licensees holding a valid commercial license may use this file in
 // accordance with the commercial license agreement provided with the software.
@@ -24,7 +25,7 @@
 
 namespace CGAL {
 
-/// \ingroup PkgPointSetProcessing
+/// \ingroup  PkgStlExtension
 /// Class providing the value type of an iterator, and
 /// in the case of an output iterator, a type of objects that can be put in it.
 ///