diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1e55693cb3..14efcfd1e1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-03 13:36 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/common/hbstr.c
+    ! fixed typo in HB_TRACE message - problem reported by Alex
+
+  * harbour/src/rtl/cdpapi.c
+    ! fixed casting for C++ builds - problem reported by Marcos
+
 2009-11-02 12:29 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/cdpapi.c
   * harbour/include/hbapicdp.h
diff --git a/harbour/src/common/hbstr.c b/harbour/src/common/hbstr.c
index 43790ed552..2e5a367472 100644
--- a/harbour/src/common/hbstr.c
+++ b/harbour/src/common/hbstr.c
@@ -819,7 +819,7 @@ char * hb_strncat( char * pDest, const char * pSource, ULONG ulLen )
 {
    char *pBuf = pDest;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_strncpy(%p, %s, %lu)", pDest, pSource, ulLen));
+   HB_TRACE(HB_TR_DEBUG, ("hb_strncat(%p, %s, %lu)", pDest, pSource, ulLen));
 
    pDest[ ulLen ] = '\0';
 
diff --git a/harbour/src/rtl/cdpapi.c b/harbour/src/rtl/cdpapi.c
index 44fdfe290b..2aa770c641 100644
--- a/harbour/src/rtl/cdpapi.c
+++ b/harbour/src/rtl/cdpapi.c
@@ -1056,7 +1056,7 @@ char * hb_cdpU16ToStr( PHB_CODEPAGE cdp, BOOL fCtrl,
    else
    {
       ulDst = ulLen + 1;
-      pDst = hb_xgrab( ulDst );
+      pDst = ( char * ) hb_xgrab( ulDst );
    }
 
    for( ul = 0; ul < ulLen && ul < ulDst; ++ul )
@@ -1102,7 +1102,7 @@ char * hb_cdpU16LEToStr( PHB_CODEPAGE cdp, BOOL fCtrl,
    else
    {
       ulDst = ulLen + 1;
-      pDst = hb_xgrab( ulDst );
+      pDst = ( char * ) hb_xgrab( ulDst );
    }
 
    for( ul = 0; ul < ulLen && ul < ulDst; ++ul )