diff --git a/CSVPage.xaml.vb b/CSVPage.xaml.vb
index c7ab493..1e5d53c 100644
--- a/CSVPage.xaml.vb
+++ b/CSVPage.xaml.vb
@@ -72,7 +72,7 @@ Public Class CSVPage
          Return
       End If
       ' Verifico se selezionato indicativo di pezzo
-      EgtSetObjFilterForSelect(True, True, True, True, True)
+      EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
       EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
       Dim nId As Integer = EgtGetFirstObjInSelWin()
diff --git a/DrawPageUC.xaml.vb b/DrawPageUC.xaml.vb
index 3a11e09..8f65e35 100644
--- a/DrawPageUC.xaml.vb
+++ b/DrawPageUC.xaml.vb
@@ -173,7 +173,7 @@ Public Class DrawPageUC
          Return
       End If
       ' Verifico se selezionato indicativo di componente (wall, door o window)
-      EgtSetObjFilterForSelect(True, True, True, True, True)
+      EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
       EgtSelect(e.Location, 2 * Scene.DIM_SEL, 2 * Scene.DIM_SEL, nSel)
       Dim sCompo As String = String.Empty
diff --git a/FrameCutPageUC.xaml.vb b/FrameCutPageUC.xaml.vb
index cef91fd..b8ba893 100644
--- a/FrameCutPageUC.xaml.vb
+++ b/FrameCutPageUC.xaml.vb
@@ -224,7 +224,7 @@ Public Class FrameCutPageUC
          Return
       End If
       ' Verifico se selezionato indicativo di pezzo
-      EgtSetObjFilterForSelect(True, True, True, True, True)
+      EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
       EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
       Dim nId As Integer = EgtGetFirstObjInSelWin()
diff --git a/ImportPageUC.xaml.vb b/ImportPageUC.xaml.vb
index b949e90..0ac8cb6 100644
--- a/ImportPageUC.xaml.vb
+++ b/ImportPageUC.xaml.vb
@@ -332,7 +332,7 @@ Public Class ImportPageUC
       ' Solo con il tasto sinistro e se stato NULL
       If e.Button <> Windows.Forms.MouseButtons.Left Or Not ImportScene.IsStatusNull() Then Return
       ' Verifico se selezionato indicativo di pezzo
-      EgtSetObjFilterForSelect(True, True, True, True, True)
+      EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
       EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
       Dim nId As Integer = EgtGetFirstObjInSelWin()
diff --git a/M_Num.vb b/M_Num.vb
index 66388b9..36cd8e8 100644
--- a/M_Num.vb
+++ b/M_Num.vb
@@ -1638,8 +1638,10 @@ Namespace Num
 
          If n_ret <> 0 Then
             EgtOutLog("Error: FileDelete error : " & n_ret.ToString())
+            Return n_ret
          End If
-         Return n_ret
+
+         Return Manage_Transfer_NC_prog()
 
       End Function
 
diff --git a/MachineCNPageUC.xaml.vb b/MachineCNPageUC.xaml.vb
index 1616072..7231ee8 100644
--- a/MachineCNPageUC.xaml.vb
+++ b/MachineCNPageUC.xaml.vb
@@ -113,11 +113,23 @@ Public Class MachineCNPageUC
    End Sub
 
    Private Sub ActivateBtn_Click(sender As Object, e As RoutedEventArgs) Handles ActivateBtn.Click
-      m_CN.ActivateProgram(DULoadTxBx.Text)     '900
+      If m_MainWindow.m_CNCommunication.m_nNCType = 1 Or m_MainWindow.m_CNCommunication.m_nNCType = 2 Then
+         Dim nName As Integer = 0
+         StringToInt(DULoadTxBx.Text, nName)
+         m_CN.ActivateProgram(nName)             ' integer version
+      Else
+         m_CN.ActivateProgram(DULoadTxBx.Text)   ' string version
+      End If
    End Sub
 
    Private Sub DeleteBtn_Click(sender As Object, e As RoutedEventArgs) Handles DeleteBtn.Click
-      m_CN.Delete_NC_prog(DULoadTxBx.Text)
+      Dim DeleteName As String = String.Empty
+      If m_MainWindow.m_CNCommunication.m_nNCType = 1 Or m_MainWindow.m_CNCommunication.m_nNCType = 2 Then
+         DeleteName = "%" & DULoadTxBx.Text
+      Else
+         DeleteName = DULoadTxBx.Text
+      End If
+      m_CN.Delete_NC_prog(DeleteName)
    End Sub
 
    Private Sub MDIConfirmBtn_Click(sender As Object, e As RoutedEventArgs) Handles MDIConfirmBtn.Click
diff --git a/MoveRawPartPage.xaml.vb b/MoveRawPartPage.xaml.vb
index af23c84..6a3a330 100644
--- a/MoveRawPartPage.xaml.vb
+++ b/MoveRawPartPage.xaml.vb
@@ -121,7 +121,7 @@ Public Class MoveRawPartPage
       ' Gruppo dei grezzi
       Dim nRawGroupId = EgtGetParent(EgtGetFirstRawPart())
       ' Verifico se selezionato indicativo di grezzo attivo
-      EgtSetObjFilterForSelect(True, True, True, True, True)
+      EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
       EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
       Dim nId As Integer = EgtGetFirstObjInSelWin()
diff --git a/NestPageUC.xaml.vb b/NestPageUC.xaml.vb
index d0579e1..bb129f3 100644
--- a/NestPageUC.xaml.vb
+++ b/NestPageUC.xaml.vb
@@ -97,7 +97,7 @@ Public Class NestPageUC
       ' Per default no drag
       m_bDrag = False
       ' Verifico se selezionato indicativo di pezzo
-      EgtSetObjFilterForSelect(True, True, True, True, True)
+      EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
       EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
       Dim nId As Integer = EgtGetFirstObjInSelWin()
diff --git a/RawPartPageUC.xaml.vb b/RawPartPageUC.xaml.vb
index 83c5ac3..364645a 100644
--- a/RawPartPageUC.xaml.vb
+++ b/RawPartPageUC.xaml.vb
@@ -225,7 +225,7 @@ Public Class RawPartPageUC
       ' Verifico cosa selezionato
       Dim nSolidId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_RAW_SOLID)
       Dim nKerfId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_KERF)
-      EgtSetObjFilterForSelect(True, True, True, True, True)
+      EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
       EgtSelect(e.Location, 2 * Scene.DIM_SEL, 2 * Scene.DIM_SEL, nSel)
       ' Ricavo nome dell'entità selezionata e identificativo
diff --git a/SplitAuto.vb b/SplitAuto.vb
index b92c916..2ec2986 100644
--- a/SplitAuto.vb
+++ b/SplitAuto.vb
@@ -73,7 +73,8 @@ Public Module SplitAuto
                   Dim dEndAddLen As Double = -10
                   EgtGetMachiningParam(MCH_MP.ENDADDLEN, dEndAddLen)
                   ' verifico se trasformabile in un taglio di separazione (almeno da un lato)
-                  If Math.Abs(Mach.m_dSideAng) < EPS_ANG_SMALL And
+                  'If Math.Abs(Mach.m_dSideAng) < EPS_ANG_SMALL And
+                  If True And
                      (dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL) And
                      Mach.m_sLay = NAME_OUTLOOP And Mach.m_nInterf = FMI_TYPE.NONE Then
                      Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
diff --git a/ToolsDbPageUC.xaml.vb b/ToolsDbPageUC.xaml.vb
index 46c6237..f470964 100644
--- a/ToolsDbPageUC.xaml.vb
+++ b/ToolsDbPageUC.xaml.vb
@@ -568,7 +568,7 @@ Public Class ToolsDbPageUC
          Return
       End If
       ' Verifico se selezionato testo di quota
-      EgtSetObjFilterForSelect(False, False, False, False, True)
+      EgtSetObjFilterForSelWin(False, False, False, False, True)
       Dim nSel As Integer
       EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
       Dim nId As Integer = EgtGetFirstObjInSelWin()