diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 12c9893111..f5f1b1526e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-07-31 21:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbexprb.c
+    * disable CTOD("") optimization when -kc switch is used
+
+  * harbour/source/macro/macro.yyc
+  * harbour/source/macro/macro.y
+    * fixed typo reported by Mindaugas
+
+  * harbour/source/vm/classes.c
+    * fixed typo reported by Lost
+
 2007-07-31 12:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/tip/utils.c
   * harbour/contrib/tip/encmthd.c
diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c
index abeaeca8b3..2bdda2bb03 100644
--- a/harbour/include/hbexprb.c
+++ b/harbour/include/hbexprb.c
@@ -1583,7 +1583,8 @@ static HB_EXPR_FUNC( hb_compExprUseFunCall )
                }
                else if( strcmp( "CTOD", pName->value.asSymbol ) == 0 && usCount )
                {
-                  hb_compExprReduceCTOD( pSelf, HB_COMP_PARAM );
+                  if( HB_SUPPORT_HARBOUR )
+                     hb_compExprReduceCTOD( pSelf, HB_COMP_PARAM );
                }
                else if( strcmp( "UPPER", pName->value.asSymbol ) == 0 && usCount )
                {
diff --git a/harbour/source/macro/macro.y b/harbour/source/macro/macro.y
index 5790768133..bb34d915be 100644
--- a/harbour/source/macro/macro.y
+++ b/harbour/source/macro/macro.y
@@ -919,8 +919,8 @@ int hb_macrolex( YYSTYPE *yylval_ptr, HB_MACRO_PTR pMacro )
       case HB_PP_TOKEN_KEYWORD:
          if( pToken->len >= 4 && pToken->len <= 6 && pToken->pNext &&
              HB_PP_TOKEN_TYPE( pToken->pNext->type ) == HB_PP_TOKEN_ALIAS &&
-             ( hb_strnicmp( "_FILED", pToken->value, pToken->len ) == 0 ||
-               hb_strnicmp( "FILED", pToken->value, pToken->len ) == 0 ) )
+             ( hb_strnicmp( "_FIELD", pToken->value, pToken->len ) == 0 ||
+               hb_strnicmp( "FIELD", pToken->value, pToken->len ) == 0 ) )
          {
             return FIELD;
          }
diff --git a/harbour/source/macro/macro.yyc b/harbour/source/macro/macro.yyc
index db2c77f875..b71a13d4fa 100644
--- a/harbour/source/macro/macro.yyc
+++ b/harbour/source/macro/macro.yyc
@@ -3323,8 +3323,8 @@ int hb_macrolex( YYSTYPE *yylval_ptr, HB_MACRO_PTR pMacro )
       case HB_PP_TOKEN_KEYWORD:
          if( pToken->len >= 4 && pToken->len <= 6 && pToken->pNext &&
              HB_PP_TOKEN_TYPE( pToken->pNext->type ) == HB_PP_TOKEN_ALIAS &&
-             ( hb_strnicmp( "_FILED", pToken->value, pToken->len ) == 0 ||
-               hb_strnicmp( "FILED", pToken->value, pToken->len ) == 0 ) )
+             ( hb_strnicmp( "_FIELD", pToken->value, pToken->len ) == 0 ||
+               hb_strnicmp( "FIELD", pToken->value, pToken->len ) == 0 ) )
          {
             return FIELD;
          }
diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c
index 9ecb5e59f3..df27190b73 100644
--- a/harbour/source/vm/classes.c
+++ b/harbour/source/vm/classes.c
@@ -278,7 +278,7 @@ static HB_SYMB s_opSymbols[ HB_OO_MAX_OPERATOR + 1 ] = {
    { "__OPLESSEQUAL",         {HB_FS_MESSAGE}, {NULL}, NULL },  /* 12 */
    { "__OPGREATER",           {HB_FS_MESSAGE}, {NULL}, NULL },  /* 13 */
    { "__OPGREATEREQUAL",      {HB_FS_MESSAGE}, {NULL}, NULL },  /* 14 */
-   { "__OPADDIGN",            {HB_FS_MESSAGE}, {NULL}, NULL },  /* 15 */
+   { "__OPASSIGN",            {HB_FS_MESSAGE}, {NULL}, NULL },  /* 15 */
    { "__OPINSTRING",          {HB_FS_MESSAGE}, {NULL}, NULL },  /* 16 */
    { "__OPNOT",               {HB_FS_MESSAGE}, {NULL}, NULL },  /* 17 */
    { "__OPAND",               {HB_FS_MESSAGE}, {NULL}, NULL },  /* 18 */