diff --git a/include/hpp/manipulation/graph/edge.hh b/include/hpp/manipulation/graph/edge.hh
index 06b1855634bf23d271d0debb6679af20a51160e9..bc36ccce7f9e05f8c4779169f46f0d56c00cff5e 100644
--- a/include/hpp/manipulation/graph/edge.hh
+++ b/include/hpp/manipulation/graph/edge.hh
@@ -99,6 +99,7 @@ namespace hpp {
 	  {
 	    return steeringMethod_;
 	  }
+
           /// Print the object in a stream.
           virtual std::ostream& dotPrint (std::ostream& os, dot::DrawingAttributes da = dot::DrawingAttributes ()) const;
 
diff --git a/src/graph-path-validation.cc b/src/graph-path-validation.cc
index 74646b667560257823d4e17ca1aaac67e714e722..292dff7d9804f4aef07c1cb0a39423ba9fe1c487 100644
--- a/src/graph-path-validation.cc
+++ b/src/graph-path-validation.cc
@@ -34,8 +34,8 @@ namespace hpp {
       assert (path);
       bool success = impl_validate (path, reverse, validPart);
       assert (constraintGraph_);
-      assert (constraintGraph_->getNode ((*validPart) (validPart->timeRange ().first)));
-      assert (constraintGraph_->getNode ((*validPart) (validPart->timeRange ().second)));
+      assert (constraintGraph_->getNode (validPart->initial ()));
+      assert (constraintGraph_->getNode (validPart->end     ()));
       return success;
     }
 
diff --git a/src/graph/graph-component.cc b/src/graph/graph-component.cc
index b7b92cd30068dfb3c157539faa6aed8e50a8f4d9..c4d49d2dc199d0693a5a76a0b5c4fb0219b3abe5 100644
--- a/src/graph/graph-component.cc
+++ b/src/graph/graph-component.cc
@@ -51,7 +51,6 @@ namespace hpp {
         return components_;
       }
 
-
       std::size_t GraphComponent::id () const
       {
         return id_;
diff --git a/src/problem-solver.cc b/src/problem-solver.cc
index 977b713700ca0319e0d2a856fbf1330265a4b8a7..4572755fada9fcce924b72347792b92c9e93b0dc 100644
--- a/src/problem-solver.cc
+++ b/src/problem-solver.cc
@@ -40,8 +40,8 @@
 namespace hpp {
   namespace manipulation {
     namespace {
-      struct PartialShortcutTrait :
-        core::pathOptimization::PartialShortcutTrait {
+      struct PartialShortcutTraits :
+        core::pathOptimization::PartialShortcutTraits {
           static bool removeLockedJoints () { return false; }
       };
     }
@@ -60,7 +60,7 @@ namespace hpp {
       addPathOptimizerType ("Graph-RandomShortcut",
           GraphOptimizer::create <core::RandomShortcut>);
       addPathOptimizerType ("PartialShortcut", core::pathOptimization::
-          PartialShortcut::createWithTrait <PartialShortcutTrait>);
+          PartialShortcut::createWithTraits <PartialShortcutTraits>);
       addPathOptimizerType ("Graph-PartialShortcut",
           GraphOptimizer::create <core::pathOptimization::PartialShortcut>);
       pathPlannerType ("M-RRT");