diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fa775c9764..e7a3517a80 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-04 19:01 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/ChangeLog
+    ! fixed typo in my recent ChangeLog entry
+
+  * harbour/src/vm/fm.c
+    % minor simplification
+
+  * harbour/src/common/hbtrace.c
+    ! fixed possible recursive call reported by Istvan
+
 2010-01-04 18:39 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * contrib/hbgd/hbgd.hbc
    + examples/httpsrv/modulesg.hbp
@@ -67,7 +77,7 @@
     + added optional support for input respecting locale settings
       To enable it it's necessary to recompile GTXWC with HB_XWC_USE_LOCALE
       macro. It can be done globally using
-         export UH_USER_CFLAGS=-DHB_XWC_USE_LOCALE
+         export HB_USER_CFLAGS=-DHB_XWC_USE_LOCALE
       and recompiling Harbour core code.
       When enabled GTXWC initialize locale at startup (LC_CTYPE only) what
       enable national keyboard layout support in default input context
diff --git a/harbour/src/common/hbtrace.c b/harbour/src/common/hbtrace.c
index 48368e566a..e62e2d19c3 100644
--- a/harbour/src/common/hbtrace.c
+++ b/harbour/src/common/hbtrace.c
@@ -246,7 +246,7 @@ static void hb_tracelog_( int level, const char * file, int line, const char * p
                       file, line, pszLevel, message );
 
       #if defined( UNICODE )
-         MultiByteToWideChar( CP_ACP, 0, hb_strncpy( message, buf.psz, sizeof( message ) - 1 ), -1,
+         MultiByteToWideChar( CP_ACP, 0, memcpy( message, buf.psz, sizeof( message ) ), -1,
                               buf.lp, HB_SIZEOFARRAY( buf.lp ) );
       #endif
       OutputDebugString( buf.lp );
diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c
index e4c69e3874..d88507d6ef 100644
--- a/harbour/src/vm/fm.c
+++ b/harbour/src/vm/fm.c
@@ -1130,8 +1130,7 @@ void hb_xexit( void ) /* Deinitialize fixed memory subsystem */
       else
       {
          hb_conOutErr( hb_conNewLine(), 0 );
-         hb_snprintf( buffer, sizeof( buffer ), HB_I_("Memory allocated but not released: none") );
-         hb_conOutErr( buffer, 0 );
+         hb_conOutErr( HB_I_("Memory allocated but not released: none"), 0 );
       }
 
       hb_conOutErr( hb_conNewLine(), 0 );