diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 651d68483d..34551a9301 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2004-03-29 15:00 UTC-0500 David G. Holm <dholm@jsd-llc.com>
+  * source/pp/ppcore.c
+    ! Added missing type conversions on calls to hb_xgrab
+      and hb_xrealloc.
+  * source/rtl/memoline.c
+    ! Convert CR to space for Clipper compatibility.
+
 2004-03-25 09:35 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   * source/rdd/dbfcdx/dbfcdx1.c
     ! minor fix
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 35ea8c2a11..b17989a95b 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -569,7 +569,7 @@ int hb_pp_ParseDefine( char * sLine )
                  if( cParams == NULL )
                  {
                     /* 'xy0' -> '~xy0' */
-                    cParams = hb_xgrab( iLen+2 );
+                    cParams = ( char * ) hb_xgrab( iLen+2 );
                  }
                  else
                  {
@@ -582,7 +582,7 @@ int hb_pp_ParseDefine( char * sLine )
                        if( *cPos == '\001' )
                            hb_compGenError( hb_pp_szErrors, 'F', HB_PP_ERR_LABEL_DUPL_IN_DEFINE, defname, pars );
                     }
-                    cParams = hb_xrealloc( cParams, iParLen+iLen+3 );
+                    cParams = ( char * ) hb_xrealloc( cParams, iParLen+iLen+3 );
                     cParams[iParLen++] = ',';
                     cParams[iParLen]   = '\0';
                  }
diff --git a/harbour/source/rtl/memoline.c b/harbour/source/rtl/memoline.c
index 3249d23648..9f13505fc5 100644
--- a/harbour/source/rtl/memoline.c
+++ b/harbour/source/rtl/memoline.c
@@ -175,7 +175,7 @@ HB_FUNC( MEMOLINE )
             if( pszString[ ulLineBegin + ulPos ] == HB_CHAR_HT )
                ulSpAdded += ( ( ULONG ) ( ulPos / ulTabLength ) * ulTabLength ) + ulTabLength - ulPos - 2;
             else
-               if( pszString[ ulLineBegin + ulPos ] == HB_CHAR_SOFT1 || pszString[ ulLineBegin + ulPos ] == HB_CHAR_LF )
+               if( pszString[ ulLineBegin + ulPos ] == HB_CHAR_SOFT1 || pszString[ ulLineBegin + ulPos ] == HB_CHAR_CR || pszString[ ulLineBegin + ulPos ] == HB_CHAR_LF )
                  ulSpAdded--;
                else
                   * ( pszLine + ulPos + ulSpAdded ) = * ( pszString + ulLineBegin + ulPos );