diff --git a/EXE_General.cpp b/EXE_General.cpp
index 03cab78..48c52a0 100644
--- a/EXE_General.cpp
+++ b/EXE_General.cpp
@@ -266,10 +266,10 @@ ExeGetMemoryInfo( string& sMem)
 }
 
 //-----------------------------------------------------------------------------
-BOOL
-__stdcall EgtOutLog( const wchar_t* sMsg)
+bool
+ExeOutLog( const string& sMsg)
 {
-   LOG_INFO( s_pGenLog, LPSTR( WtoA( sMsg)))
+   LOG_INFO( s_pGenLog, sMsg.c_str())
    return ( s_pGenLog != nullptr) ;
 }
 
diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 84c1672..5f0ce0c 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -29,11 +29,11 @@ bool
 ExeInitMachMgr( const string& sMachinesDir)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
-   VERIFY_CTX( pGseCtx, false)
+   VERIFY_CTX_GEOMDB( pGseCtx, false)
   // inizializzazione gestore lavorazioni
    PtrOwner<IMachMgr> pMachMgr( MyCreateMachMgr()) ;
    VERIFY_NULL( Get( pMachMgr), "Error in CreateMachMgr", false)
-   bool bOk = pMachMgr->Init( pGseCtx->m_pGeomDB, sMachinesDir) ;
+   bool bOk = pMachMgr->Init( GetIndCurrGseContext(), pGseCtx->m_pGeomDB, sMachinesDir) ;
   // assegno il gestore al contesto
    pGseCtx->m_pMachMgr = ( bOk ? Release( pMachMgr) : nullptr) ;
   // log avvio Machining Manager
diff --git a/EXE_Scene.cpp b/EXE_Scene.cpp
index aa0363e..c43d55a 100644
--- a/EXE_Scene.cpp
+++ b/EXE_Scene.cpp
@@ -27,7 +27,7 @@ bool
 ExeInitScene( HWND hWnd, int nDriver, bool b2Buff, int nColorBits, int nDepthBits)
 {
    GseContext* pGseCtx = GetCurrGseContext() ;
-   VERIFY_CTX( pGseCtx, false)
+   VERIFY_CTX_GEOMDB( pGseCtx, false)
   // inizializzazione scena OpenGL
    PtrOwner<IEGrScene> pScene( MyCreateEGrScene()) ;
    VERIFY_NULL( Get( pScene), "Error in CreateEGrScene", false)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index f95ca78..c3d7d16 100644
Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ
diff --git a/LUA_Base.cpp b/LUA_Base.cpp
index 3f1df9a..056b1cc 100644
--- a/LUA_Base.cpp
+++ b/LUA_Base.cpp
@@ -16,13 +16,14 @@
 #include "EXE.h"
 #include "LUA.h"
 #include "LUA_Base.h"
+#include "/EgtDev/Include/EXeExecutor.h"
 #include "/EgtDev/Include/EGnLuaMgr.h"
 
 using namespace std ;
 
 //----------------------------------------------------------------------------
 bool
-LuaInstallAllFunctions( LuaMgr& LuaMgr)
+LuaInstallEgtFunctions( LuaMgr& LuaMgr)
 {
    if ( ! LuaInstallGeneral( LuaMgr)) {
       LOG_ERROR( GetLogger(), "Error in LuaInstallGeneral (" __FUNCTION__ ")")
@@ -113,7 +114,7 @@ LuaInit( void)
       return false ;
 
   // carico le funzioni speciali
-   if ( ! LuaInstallAllFunctions( s_LuaMgr))
+   if ( ! LuaInstallEgtFunctions( s_LuaMgr))
       return false ;
 
   // recupero la versione di Lua