diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0719280903..debed65f10 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-30 21:15 UTC+0800 Ron Pinkas <ron@profit-master.com>
+  * source/macro/macro.slx
+    ! Corrected 1 unreleased memory block.
+
+  * source/compiler/harbour.slx
+    - Removed unneeded comment.
+
+  * source/compiler/simplex.c
+    * Changed void yy_bytes_buffer() to void *.
+
 2000-07-31 00:10 GMT -3 Luiz Rafael Culik <culik@sl.conex.net>
 
 *contrib/hbzlib/zipfile2.c
diff --git a/harbour/source/compiler/harbour.slx b/harbour/source/compiler/harbour.slx
index c4df593ed3..88133a565e 100644
--- a/harbour/source/compiler/harbour.slx
+++ b/harbour/source/compiler/harbour.slx
@@ -1022,8 +1022,6 @@ LANGUAGE_RULES_ARE {
    else if( yytext[0] == '0' && yytext[1] == 'X' )\
    {\
       long lNumber = hb_lex_Hex2L( yytext + 2 );\
-\
-      /* sscanf( yytext, "%lxI", &lNumber );*/\
 \
       if( ( double ) SHRT_MIN <= lNumber && lNumber <= ( double ) SHRT_MAX )\
       {\
diff --git a/harbour/source/compiler/simplex.c b/harbour/source/compiler/simplex.c
index f1379e2553..a508774c52 100644
--- a/harbour/source/compiler/simplex.c
+++ b/harbour/source/compiler/simplex.c
@@ -1335,8 +1335,9 @@ int Reduce( int iToken, BOOL bReal )
    iSize = 0;
 }
 
-void yy_bytes_buffer( char * pBuffer, int iBufSize )
+void * yy_bytes_buffer( char * pBuffer, int iBufSize )
 {
    s_szBuffer = pBuffer;
    iSize = iBufSize;
+   return s_szBuffer;
 }