diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
index 92e291e53e7..c3abd5a7be5 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
@@ -126,6 +126,7 @@ template <class Base_> struct Kernel_d_interface : public Base_ {
           CGAL_FUNCTOR_INIT_STORE(Construct_cartesian_const_iterator_d)
           typedef typename Get_functor<Base, Construct_ttag<Point_cartesian_const_iterator_tag> >::type CPI;
           typedef typename Get_functor<Base, Construct_ttag<Vector_cartesian_const_iterator_tag> >::type CVI;
+          // @mglisse shall we update that code ?
           // FIXME: The following sometimes breaks compilation. The typedef below forces instantiation of this, which forces Point_d, which itself (in the wrapper) needs the derived kernel to tell it what the base kernel is, and that's a cycle. The exact circumstances are not clear, g++ and clang++ are ok in both C++03 and C++11, it is only clang in C++11 without CGAL_CXX11 that breaks. Relying on CPI::result_type is great for Epick_d but not Epeck_d.
           // typedef typename CGAL::decay<typename boost::result_of<CPI(Point_d,CGAL::Begin_tag)>::type>::type result_type;
           // typedef typename CGAL::decay<typename CPI::result_type>::type result_type;
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h
index 1ec2d4ef977..776b59b67a6 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h
@@ -56,6 +56,7 @@ template<class T> struct Is_wrapper_iterator<T,true> :
 { };
 
 struct Forward_rep {
+//@mglisse shall we update that code?
 //TODO: make a good C++0X version with perfect forwarding
 //#ifdef CGAL_CXX11
 //template <class T,class=typename std::enable_if<!Is_wrapper<typename std::decay<T>::type>::value&&!Is_wrapper_iterator<typename std::decay<T>::type>::value>::type>
diff --git a/STL_Extension/include/CGAL/thread.h b/STL_Extension/include/CGAL/thread.h
index 7d163964cf7..67ecbd39a55 100644
--- a/STL_Extension/include/CGAL/thread.h
+++ b/STL_Extension/include/CGAL/thread.h
@@ -33,6 +33,7 @@
   double-typed seconds as argument and deals with it.
 */
 
+// @lrineau shall we simply ignore TBB_IMPLEMENT_CPP0X?
 #if defined(CGAL_LINKED_WITH_TBB)
 #  include <tbb/tbb_config.h>
 #  if TBB_IMPLEMENT_CPP0X
diff --git a/Stream_support/include/CGAL/IO/helpers.h b/Stream_support/include/CGAL/IO/helpers.h
index f9dd0bdac69..98830e089c8 100644
--- a/Stream_support/include/CGAL/IO/helpers.h
+++ b/Stream_support/include/CGAL/IO/helpers.h
@@ -26,6 +26,7 @@ namespace CGAL {
 namespace IO {
 namespace internal {
 
+// @MaelRL Shall we update that code now?
 // Ideally this should be a std::is_constructible(double, double, double) but boost::is_constructible
 // is not safe to use without CXX11
 template <typename Kernel>