diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 702960fc32..fc907eaccc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+
+  * harbour/source/compiler/harbour.c
+    * added note in hb_compOptimizeFrames() about exceeding maximum number
+      of local variables (255). We should add new pcode(s) HB_P_LARGE[V]FRAME
       or generate compile time error.
 
   * harbour/source/vm/macro.c
diff --git a/harbour/source/common/expropt2.c b/harbour/source/common/expropt2.c
index b5f5c22b05..7a2e348bc0 100644
--- a/harbour/source/common/expropt2.c
+++ b/harbour/source/common/expropt2.c
@@ -1294,7 +1294,7 @@ BOOL hb_compExprReduceSTOD( HB_EXPR_PTR pSelf, USHORT usCount, HB_MACRO_DECL )
       {
          HB_EXPR_PTR pExpr = hb_compExprNewDate( pArg->ulLength == 0 ? 0 : hb_dateEncStr( pArg->value.asString.string ) );
       
-         hb_compExprFree( pSelf->value.asFunCall.pParms, HB_MACRO_PARAM );
+         hb_compExprFree( pParms, HB_MACRO_PARAM );
          hb_compExprFree( pSelf->value.asFunCall.pFunName, HB_MACRO_PARAM );
          memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
          hb_compExprClear( pExpr );
@@ -1305,6 +1305,7 @@ BOOL hb_compExprReduceSTOD( HB_EXPR_PTR pSelf, USHORT usCount, HB_MACRO_DECL )
    {
       HB_EXPR_PTR pExpr = hb_compExprNewDate( 0 );
       
+      hb_compExprFree( pSelf->value.asFunCall.pParms, HB_MACRO_PARAM );
       hb_compExprFree( pSelf->value.asFunCall.pFunName, HB_MACRO_PARAM );
       memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
       hb_compExprClear( pExpr );