Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2238 -r2271
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 2238)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 2271)
@@ -507,7 +507,6 @@
         /// TODO
         /// </summary>
         /// <remarks>Composite relationship.</remarks>
-        [ReadOnly(true)]
         [Validate]
         public virtual SurfaceLine2 LocalXZSurfaceLine2
         {
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs
===================================================================
diff -u -r2238 -r2271
--- DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs	(.../DamContext.cs)	(revision 2238)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs	(.../DamContext.cs)	(revision 2271)
@@ -167,7 +167,13 @@
             // Make sure CharacteristicPoints can not be edited for now.
             if (source is CharacteristicPoint)
             {
-                return false;
+                if (member == StaticReflection.GetMemberName<CharacteristicPoint>(x => x.X) ||
+                    member == StaticReflection.GetMemberName<CharacteristicPoint>(x => x.Y) ||
+                    member == StaticReflection.GetMemberName<CharacteristicPoint>(x => x.Z))
+                {
+                    return false;
+                }
+                return true;                
             }
 
             if (source is Soil && member != StaticReflection.GetMemberName<Soil>(x => x.StrengthIncreaseExponent))
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r2238 -r2271
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 2238)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 2271)
@@ -356,6 +356,7 @@
                 Mechanism.PipingUpliftGradient,
                 Mechanism.Stability
             };
+            MechanismSupport.Mechanisms = Soil.Mechanisms;
         }
 
         private void ConfigureChart()
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamSurfaceLineControl.cs
===================================================================
diff -u -r2254 -r2271
--- DamClients/DamUI/trunk/src/Dam/Forms/DamSurfaceLineControl.cs	(.../DamSurfaceLineControl.cs)	(revision 2254)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamSurfaceLineControl.cs	(.../DamSurfaceLineControl.cs)	(revision 2271)
@@ -101,7 +101,7 @@
                     var locJob = value as LocationJob;
                     if (locJob != null)
                     {
-                        CharacteristicPoints = locJob.Location.SurfaceLine2.CharacteristicPoints;
+                        CharacteristicPoints = locJob.Location.LocalXZSurfaceLine2.CharacteristicPoints;
                         BindSupport.Assign(this, this);
                     }
                 }