diff --git a/src/main/java/ui/AvatarPanelDrawer.java b/src/main/java/ui/AvatarPanelDrawer.java
index 8a221b1b7adc56f2f6a9dfe08b119b0bb8c40fce..89874aea753c8d997847d75dd85e5e90e877d5ec 100644
--- a/src/main/java/ui/AvatarPanelDrawer.java
+++ b/src/main/java/ui/AvatarPanelDrawer.java
@@ -483,7 +483,7 @@ public class AvatarPanelDrawer {
 
 			if ((p1 == null) || (p2 == null)) {
 				if (p1 == null) {
-					p1 = tranSourceMap.get(t).closerFreeTGConnectingPointNoOverlay(x, y, true, false);
+					p1 = tranSourceMap.get(t).closerFreeTGConnectingPointNoOverlay(x, y, false, true);
 					//p1 = tranSourceMap.get(t).closerFreeTGConnectingPoint(x, y, false, true);
 					if (p1 == null) {
 						TraceManager.addDev("NULL P1 in " + tranSourceMap.get(t).getName() + "/" + tranSourceMap.get(t).getValue());
@@ -505,7 +505,7 @@ public class AvatarPanelDrawer {
 					}
 				}
 				if (p2 == null) {
-					p2 = locMap.get(tranDestMap.get(t)).closerFreeTGConnectingPointNoOverlay(x, y, false, true);
+					p2 = locMap.get(tranDestMap.get(t)).closerFreeTGConnectingPointNoOverlay(x, y, true, false);
 					//p2 = locMap.get(tranDestMap.get(t)).closerFreeTGConnectingPoint(x, y, true, false);
 					if (p2 == null) {
 						TraceManager.addDev("NULL P2 in " + locMap.get(tranDestMap.get(t)).getName() + "/" + locMap.get(tranDestMap.get(t)).getValue());
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 3e567cacffba515a4259c1b869b2c24d241f6875..b43953b2f78f456dce9f10d3a0dc9bb57914c6a9 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -215,10 +215,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
     public static boolean picoZebre;
     public static boolean openLast;
     public static Object BACK_COLOR;
-    public boolean isxml = false;
+
     public JFrame frame; // Main Frame
     public Container framePanel; // Main pane
-    public Container panelForTab, panelForTree; // panelForAnalysisTab; //panelForDesignTab;
+    public Container panelForTab;
     public JSplitPane split, split1;
     // Multi analysis / design / deployment
     public Vector<TURTLEPanel> tabs;
@@ -318,8 +318,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
     private JFrameAvatarInteractiveSimulation jfais;
     private JFrameCompareSimulationTraces cSimTrace;
 
-
-    private LatencyDetailedAnalysisMain LatencyDetailedAnalysisMain;
+    private LatencyDetailedAnalysisMain latencyDetailedAnalysisMain;
 
 
     // Help
@@ -3242,7 +3241,8 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
                 FileOutputStream fos = new FileOutputStream(file);
                 fos.write(data.getBytes());
                 fos.close();
-
+                TraceManager.addDev("SysML v2 specification successfully saved in " + file.getAbsolutePath());
+                status.setText("SysML v2 specification successfully saved in " + file.getAbsolutePath());
                 return true;
             } catch (Exception e) {
                 JOptionPane.showMessageDialog(frame, "File could not be saved because " + e.getMessage(), "File Error",
@@ -10236,7 +10236,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
     public void compareLatencyForXML(SimulationTrace selectedST, boolean b) {
 
         try {
-            LatencyDetailedAnalysisMain = new LatencyDetailedAnalysisMain(1, this, selectedST, b, false, 0);
+            latencyDetailedAnalysisMain = new LatencyDetailedAnalysisMain(1, this, selectedST, b, false, 0);
         } catch (InterruptedException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -10248,7 +10248,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
             throws XPathExpressionException, ParserConfigurationException, SAXException, IOException {
 
         try {
-            LatencyDetailedAnalysisMain = new LatencyDetailedAnalysisMain(2, this, selectedST, b, compare, j);
+            latencyDetailedAnalysisMain = new LatencyDetailedAnalysisMain(2, this, selectedST, b, compare, j);
         } catch (InterruptedException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();