diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5ed8686b89..553d26fe8f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,16 @@
+2001-08-06 20:50 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+
+  * source/rtl/math.c
+    ! Added missing type override for hb_xgrab return value on line 99
+      (type overrides are *mandatory* for hb_xgrab and hb_xrealloc, so
+      that Harbour can be built using C++ compilers).
+
+  * source/rtl/gtsln/gtsln.c
+  * contrib/libct/ctstr.c
+  	! Fixed typos causing compile errors with HB_TR_DEBUG and gcc. Case
+  	  error in variable names in debug info calls (e.g. nstrLen instead
+  	  of nStrLen). Fixed by "Fergus McDonald" <listsub@qvolution.com>
+
 2001-08-06 20:30 GMT -3 Luiz Rafael Culik <culik@sl.conex.net>
    *source/rtl/tbrowse.prg
       * Fixed support to display pictures in TBrwose. Thanks for Manu Exposito <maex14@dipusevilha.es>
diff --git a/harbour/contrib/libct/ctstr.c b/harbour/contrib/libct/ctstr.c
index 04634a1d8f..499cf9e7e7 100644
--- a/harbour/contrib/libct/ctstr.c
+++ b/harbour/contrib/libct/ctstr.c
@@ -83,7 +83,7 @@ char *ct_at_exact_forward (char *pcString, size_t sStrLen,
   size_t sPos;
   
   HB_TRACE(HB_TR_DEBUG, ("ct_at_exact_forward (\"%s\", %u, \"%s\", %u, %p)",
-                          pcString, sStrlen, pcMatch, sMatchLen, psMatchStrLen));
+                          pcString, sStrLen, pcMatch, sMatchLen, psMatchStrLen));
   
   if ((sMatchLen == 0) || (sStrLen < sMatchLen))
     return (NULL);
@@ -228,7 +228,7 @@ char *ct_at_charset_forward (char *pcString, size_t sStrLen,
   char *pcRet, *pcSet, *pcStop1, *pcStop2;
 
   HB_TRACE(HB_TR_DEBUG, ("ct_at_charset_forward (\"%s\", %u, \"%s\", %u, %p)",
-                          pcString, sStrlen, pcCharSet, sCharSetLen, psMatchedCharPos));
+                          pcString, sStrLen, pcCharSet, sCharSetLen, psMatchedCharPos));
   
   *(psMatchedCharPos) = sCharSetLen;
                         
@@ -264,7 +264,7 @@ char *ct_at_charset_backward (char *pcString, size_t sStrLen,
   char *pcRet, *pcSet, *pcStop;
 
   HB_TRACE(HB_TR_DEBUG, ("ct_at_charset_backward (\"%s\", %u, \"%s\", %u, %p)",
-                          pcString, sStrlen, pcCharSet, sCharSetLen, psMatchedCharPos));
+                          pcString, sStrLen, pcCharSet, sCharSetLen, psMatchedCharPos));
   
   *(psMatchedCharPos) = sCharSetLen;
 
diff --git a/harbour/source/rtl/gtsln/gtsln.c b/harbour/source/rtl/gtsln/gtsln.c
index 30b865ba7d..f522de24c9 100644
--- a/harbour/source/rtl/gtsln/gtsln.c
+++ b/harbour/source/rtl/gtsln/gtsln.c
@@ -631,7 +631,7 @@ void hb_gt_Scroll( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight,
    int iLength = ( usRight - usLeft ) + 1;
    int iCount, iColOld, iColNew, iColSize;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_gt_Scroll(%hu, %hu, %hu, %hu, %d, %hd, %hd)", uiTop, uiLeft, uiBottom, uiRight, (int) byAttr, iRows, iCols));
+   HB_TRACE(HB_TR_DEBUG, ("hb_gt_Scroll(%hu, %hu, %hu, %hu, %d, %hd, %hd)", usTop, usLeft, usBottom, usRight, (int) byAttr, iRows, iCols));
 
    if( hb_gtRectSize( usTop, usLeft, usBottom, usRight, &uiSize ) == 0 )
    {
@@ -815,7 +815,7 @@ void hb_gt_Replicate( USHORT uiRow, USHORT uiCol, BYTE byAttr, BYTE byChar, ULON
    unsigned char Pos, Msk;
    SLsmg_Char_Type SLchar, SLattr, * pScr;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_gt_Replicate(%hu, %hu, %i, %i, %lu)", uiRow, uiCol, byAttr, byChar, nLength));
+   HB_TRACE(HB_TR_DEBUG, ("hb_gt_Replicate(%hu, %hu, %i, %i, %lu)", uiRow, uiCol, byAttr, byChar, ulLen));
 
    pScr = ( SLsmg_Char_Type * ) hb_xgrab( ( ulLen + 1 ) * sizeof( SLsmg_Char_Type ) );
 
diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c
index 74dec42230..8e9218e17c 100644
--- a/harbour/source/rtl/math.c
+++ b/harbour/source/rtl/math.c
@@ -96,7 +96,7 @@ HB_MATH_HANDLERHANDLE hb_installMathHandler (HB_MATH_HANDLERPROC handlerproc)
   PHB_MATH_HANDLERCHAINELEMENT pChain, pNewChainelement;
 
   HB_TRACE(HB_TR_DEBUG, ("hb_installMathHandler (%p)", handlerproc));
-  pNewChainelement = hb_xgrab (sizeof (HB_MATH_HANDLERCHAINELEMENT));
+  pNewChainelement = (PHB_MATH_HANDLERCHAINELEMENT)hb_xgrab (sizeof (HB_MATH_HANDLERCHAINELEMENT));
   pNewChainelement->handlerproc = handlerproc;
   pNewChainelement->status      = HB_MATH_HANDLER_STATUS_ACTIVE;
                                   /* initially activated */