diff --git a/BatchProcess.lua b/BatchProcess.lua
index 90ad757..8274532 100644
--- a/BatchProcess.lua
+++ b/BatchProcess.lua
@@ -102,7 +102,7 @@ local function UpdateAuxData( sAuxFile)
    -- Se definito PROJID, aggiorno
    local sProjId = EgtGetStringFromIni( 'AuxData', 'PROJID', '', sAuxFile)
    if sProjId ~= '' then
-      EgtSetInfo( BtlInfoId, 'PROJECT', sProjId)
+      EgtSetInfo( BtlInfoId, 'PROJECTNUMBER', sProjId)
       bModif = true
    end
    -- Se definito PRODID, aggiorno
diff --git a/LuaLibs/Squaring.lua b/LuaLibs/Squaring.lua
index 8caa5bb..1faeafb 100644
--- a/LuaLibs/Squaring.lua
+++ b/LuaLibs/Squaring.lua
@@ -466,7 +466,10 @@ function Squaring.AddMachinings( SquaringParameters, b3Squaring, nFirstOperation
          EgtSetMachiningParam( MCH_MP.USERNOTES, sUserNotes)
 
          local bOk = EgtApplyMachining( true, false)
-         EgtRelocateGlob( nOperationId, nFirstOperationId, GDB_IN.BEFORE)
+         -- la squadratura va sempre prima delle eventuali altre lavorazioni
+         if nFirstOperationId then
+            EgtRelocateGlob( nOperationId, nFirstOperationId, GDB_IN.BEFORE)
+         end
          if not bOk then
             local _, sMsg = EgtGetLastMachMgrError()
             nNotOkCount = nNotOkCount + 1
diff --git a/LuaLibs/WallExec.lua b/LuaLibs/WallExec.lua
index ec2c812..1a5e0ec 100644
--- a/LuaLibs/WallExec.lua
+++ b/LuaLibs/WallExec.lua
@@ -1127,7 +1127,10 @@ local function AddSquaring( SquaringParameters, b3Squaring)
       return false, sMsg
    end
 
-   Squaring.AddScrapRemoval( nFirstOperationId)
+   -- se presenti altre lavorazioni, prima di queste va eseguita la pulizia sfridi
+   if nFirstOperationId then
+      Squaring.AddScrapRemoval( nFirstOperationId)
+   end
 
    return true, sMsg
 end