diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 116cfd943d..d936ba414d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-08 19:33 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/vm/macro.c
+    ! fixed buffer overflow caused by wrong pointer type
+      ( 'HB_ULONG*' instead of 'int *' )
+
+  * harbour/src/vm/set.c
+    ! fixed bug in MT mode - when new thread was created then _SET_PATH
+      setting was not cloned but wrongly shared with parent thread - many
+      thanks to Rossine for the information
+
 2010-03-08 19:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbpgsql/tests/test.prg
     ! Fixed missing connection parameters from PQ API calls.
diff --git a/harbour/src/vm/macro.c b/harbour/src/vm/macro.c
index b5a7dfabaf..a7d52a5398 100644
--- a/harbour/src/vm/macro.c
+++ b/harbour/src/vm/macro.c
@@ -74,7 +74,7 @@
 
 static void hb_macroFlagsInit( void * pFlags )
 {
-   * ( ( HB_ULONG * ) pFlags ) = HB_SM_DEFAULT;
+   * ( ( int * ) pFlags ) = HB_SM_DEFAULT;
 }
 
 static HB_TSD_NEW( s_macroFlags, sizeof( int ), hb_macroFlagsInit, NULL );
diff --git a/harbour/src/vm/set.c b/harbour/src/vm/set.c
index d5b24aff14..1c88dc40c7 100644
--- a/harbour/src/vm/set.c
+++ b/harbour/src/vm/set.c
@@ -1169,7 +1169,7 @@ PHB_SET_STRUCT hb_setClone( PHB_SET_STRUCT pSrc )
    memcpy( pSet, pSrc, sizeof( HB_SET_STRUCT ) );
 
    pSet->hb_set_althan = pSet->hb_set_extrahan = pSet->hb_set_printhan = FS_ERROR;
-
+   pSet->hb_set_path = NULL;
    pSet->hb_set_listener = NULL;
 
    pSet->HB_SET_TYPEAHEAD = HB_DEFAULT_INKEY_BUFSIZE;
@@ -1193,6 +1193,8 @@ PHB_SET_STRUCT hb_setClone( PHB_SET_STRUCT pSrc )
    if( pSet->HB_SET_OSCODEPAGE )   pSet->HB_SET_OSCODEPAGE   = hb_strdup( pSet->HB_SET_OSCODEPAGE );
    if( pSet->HB_SET_DBCODEPAGE )   pSet->HB_SET_DBCODEPAGE   = hb_strdup( pSet->HB_SET_DBCODEPAGE );
 
+   hb_fsAddSearchPath( pSet->HB_SET_PATH, &pSet->hb_set_path );
+
    return pSet;
 }